Moved hints.m4, apr_common.m4, and helpers/apr-conf.m4 into the

new apr/build directory as apr_hints.m4, apr_common.m4, apr_network.m4,
and apr_threads.m4.


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@61242 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 0 insertions, 539 deletions

diff --git a/helpers/apr-conf.m4 b/helpers/apr-conf.m4
deleted file mode 100644
index 36ce38fc0..000000000
--- a/helpers/apr-conf.m4
+++ /dev/null
@@ -1,539 +0,0 @@
-dnl
-dnl apr-conf.m4: APR's autoconf support macros
-dnl
-
-define(AC_USE_FUNCTION,[dnl
-AC_CHECK_FUNCS($1)
-if test ".$ac_func_$1" = .yes; then 
-AC_DEFINE(USE_$2)
-fi
-])
-
-
-AC_DEFUN(AC_CHECK_DEFINE_FILES,[
-  AC_CACHE_CHECK([for $1 in $2],ac_cv_define_$1,[
-    ac_cv_define_$1=no
-    for curhdr in $2
-    do
-      AC_EGREP_CPP(YES_IS_DEFINED, [
-      #include <$curhdr>
-      #ifdef $1
-      YES_IS_DEFINED
-      #endif
-      ], ac_cv_define_$1=yes)
-    done
-  ])
-  if test "$ac_cv_define_$1" = "yes"; then
-    AC_DEFINE(HAVE_$1)
-  fi
-])
-
-
-AC_DEFUN(AC_CHECK_DEFINE,[
-  AC_CACHE_CHECK([for $1 in $2],ac_cv_define_$1,[
-    AC_EGREP_CPP(YES_IS_DEFINED, [
-    #include <$2>
-    #ifdef $1
-    YES_IS_DEFINED
-    #endif
-    ], ac_cv_define_$1=yes, ac_cv_define_$1=no)
-  ])
-  if test "$ac_cv_define_$1" = "yes"; then
-    AC_DEFINE(HAVE_$1)
-  fi
-])
-
-
-define(AC_IFALLYES,[dnl
-ac_rc=yes
-for ac_spec in $1; do
-    ac_type=`echo "$ac_spec" | sed -e 's/:.*$//'`
-    ac_item=`echo "$ac_spec" | sed -e 's/^.*://'`
-    case $ac_type in
-        header )
-            ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'`
-            ac_var="ac_cv_header_$ac_item"
-            ;;
-        file )
-            ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'`
-            ac_var="ac_cv_file_$ac_item"
-            ;;
-        func )   ac_var="ac_cv_func_$ac_item"   ;;
-        define ) ac_var="ac_cv_define_$ac_item" ;;
-        custom ) ac_var="$ac_item" ;;
-    esac
-    eval "ac_val=\$$ac_var"
-    if test ".$ac_val" != .yes; then
-        ac_rc=no
-        break
-    fi
-done
-if test ".$ac_rc" = .yes; then
-    :
-    $2
-else
-    :
-    $3
-fi
-])
-
-
-define(AC_BEGIN_DECISION,[dnl
-ac_decision_item='$1'
-ac_decision_msg='FAILED'
-ac_decision=''
-])
-
-
-define(AC_DECIDE,[dnl
-ac_decision='$1'
-ac_decision_msg='$2'
-ac_decision_$1=yes
-ac_decision_$1_msg='$2'
-])
-
-
-define(AC_DECISION_OVERRIDE,[dnl
-    ac_decision=''
-    for ac_item in $1; do
-         eval "ac_decision_this=\$ac_decision_${ac_item}"
-         if test ".$ac_decision_this" = .yes; then
-             ac_decision=$ac_item
-             eval "ac_decision_msg=\$ac_decision_${ac_item}_msg"
-         fi
-    done
-])
-
-
-define(AC_DECISION_FORCE,[dnl
-ac_decision="$1"
-eval "ac_decision_msg=\"\$ac_decision_${ac_decision}_msg\""
-])
-
-
-define(AC_END_DECISION,[dnl
-if test ".$ac_decision" = .; then
-    echo "[$]0:Error: decision on $ac_decision_item failed" 1>&2
-    exit 1
-else
-    if test ".$ac_decision_msg" = .; then
-        ac_decision_msg="$ac_decision"
-    fi
-    AC_DEFINE_UNQUOTED(${ac_decision_item})
-    AC_MSG_RESULT([decision on $ac_decision_item... $ac_decision_msg])
-fi
-])
-
-dnl ### AC_TRY_RUN had some problems actually using a programs return code,
-dnl ### so I am re-working it here to be used in APR's configure script.
-dnl MY_TRY_RUN(PROGRAM, [ACTION-IF-TRUE [, ACTION-IF-FALSE
-dnl            [, ACTION-IF-CROSS-COMPILING]]])
-AC_DEFUN(MY_TRY_RUN,
-[if test "$cross_compiling" = yes; then
-  ifelse([$4], ,
-    [errprint(__file__:__line__: warning: [AC_TRY_RUN] called without default to allow cross compiling
-)dnl
-  AC_MSG_ERROR(can not run test program while cross compiling)],
-  [$4])
-else
-  MY_TRY_RUN_NATIVE([$1], [$2], [$3])
-fi
-])
-
-dnl Like AC_TRY_RUN but assumes a native-environment (non-cross) compiler.
-dnl MY_TRY_RUN_NATIVE(PROGRAM, [ACTION-IF-TRUE [, ACTION-IF-FALSE]])
-AC_DEFUN(MY_TRY_RUN_NATIVE,
-[cat > conftest.$ac_ext <<EOF
-[#]line __oline__ "configure"
-#include "confdefs.h"
-ifelse(AC_LANG, CPLUSPLUS, [#ifdef __cplusplus
-extern "C" void exit(int);
-#endif
-])dnl
-[$1]
-EOF
-if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-dnl Don't remove the temporary files here, so they can be examined.
-  ifelse([$2], , :, [$2])
-else
-ifelse([$3], , , [  $3 
-  rm -fr conftest*
-])dnl
-fi
-rm -fr conftest*])
-
-
-dnl A variant of AC_CHECK_SIZEOF which allows the checking of
-dnl sizes of non-builtin types
-dnl AC_CHECK_SIZEOF_EXTENDED(INCLUDES, TYPE [, CROSS_SIZE])
-AC_DEFUN(AC_CHECK_SIZEOF_EXTENDED,
-[changequote(<<,>>)dnl
-dnl The name to #define
-define(<<AC_TYPE_NAME>>, translit(sizeof_$2, [a-z *], [A-Z_P]))dnl
-dnl The cache variable
-define(<<AC_CV_NAME>>, translit(ac_cv_sizeof_$2, [ *],[<p>]))dnl
-changequote([, ])dnl
-AC_MSG_CHECKING(size of $2)
-AC_CACHE_VAL(AC_CV_NAME,
-[AC_TRY_RUN([#include <stdio.h>
-$1
-main()
-{
-  FILE *f=fopen("conftestval","w");
-  if (!f) exit(1);
-  fprintf(f, "%d\n", sizeof($2));
-  exit(0);
-}], AC_CV_NAME=`cat conftestval`, AC_CV_NAME=0, ifelse([$3],,,
-AC_CV_NAME=$3))])dnl
-AC_MSG_RESULT($AC_CV_NAME)
-AC_DEFINE_UNQUOTED(AC_TYPE_NAME, $AC_CV_NAME)
-undefine([AC_TYPE_NAME])dnl
-undefine([AC_CV_NAME])dnl
-])
-
-dnl
-dnl check for working getaddrinfo()
-dnl
-AC_DEFUN(APR_CHECK_WORKING_GETADDRINFO,[
-  AC_CACHE_CHECK(for working getaddrinfo, ac_cv_working_getaddrinfo,[
-  AC_TRY_RUN( [
-#ifdef HAVE_NETDB_H
-#include <netdb.h>
-#endif
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-
-void main(void) {
-    struct addrinfo hints, *ai;
-    int error;
-
-    memset(&hints, 0, sizeof(hints));
-    hints.ai_family = AF_UNSPEC;
-    hints.ai_socktype = SOCK_STREAM;
-    error = getaddrinfo("127.0.0.1", "8080", &hints, &ai);
-    if (error) {
-        exit(1);
-    }
-    else {
-        exit(0);
-    }
-}
-],[
-  ac_cv_working_getaddrinfo="yes"
-],[
-  ac_cv_working_getaddrinfo="no"
-],[
-  ac_cv_working_getaddrinfo="yes"
-])])
-if test "$ac_cv_working_getaddrinfo" = "yes"; then
-  AC_DEFINE(HAVE_GETADDRINFO, 1, [Define if getaddrinfo exists and works well enough for APR])
-fi
-])
-
-dnl
-dnl check for gethostbyname() which handles numeric address strings
-dnl
-AC_DEFUN(APR_CHECK_GETHOSTBYNAME_NAS,[
-  AC_CACHE_CHECK(for gethostbyname() which handles numeric address strings, ac_cv_gethostbyname_nas,[
-  AC_TRY_RUN( [
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
-#ifdef HAVE_NETDB_H
-#include <netdb.h>
-#endif
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-void main(void) {
-    struct hostent *he = gethostbyname("127.0.0.1");
-    if (he == NULL) {
-        exit(1);
-    }
-    else {
-        exit(0);
-    }
-}
-],[
-  ac_cv_gethostbyname_nas="yes"
-],[
-  ac_cv_gethostbyname_nas="no"
-],[
-  ac_cv_gethostbyname_nas="yes"
-])])
-if test "$ac_cv_gethostbyname_nas" = "yes"; then
-  AC_DEFINE(GETHOSTBYNAME_HANDLES_NAS, 1, [Define if gethostbyname() handles nnn.nnn.nnn.nnn])
-fi
-])
-
-dnl 
-dnl check for socklen_t, fall back to unsigned int
-dnl
-AC_DEFUN(APR_CHECK_SOCKLEN_T,[
-AC_CACHE_CHECK(for socklen_t, ac_cv_socklen_t,[
-AC_TRY_COMPILE([
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-],[
-socklen_t foo = (socklen_t) 0;
-],[
-    ac_cv_socklen_t=yes
-],[
-    ac_cv_socklen_t=no
-])
-])
-
-if test "$ac_cv_socklen_t" = "yes"; then
-  AC_DEFINE(HAVE_SOCKLEN_T, 1, [Whether you have socklen_t])
-fi
-])
-
-
-AC_DEFUN(APR_EBCDIC,[
-  AC_CACHE_CHECK([whether system uses EBCDIC],ac_cv_ebcdic,[
-  AC_TRY_RUN( [
-int main(void) { 
-  return (unsigned char)'A' != (unsigned char)0xC1; 
-} 
-],[
-  ac_cv_ebcdic="yes"
-],[
-  ac_cv_ebcdic="no"
-],[
-  ac_cv_ebcdic="no"
-])])
-  if test "$ac_cv_ebcdic" = "yes"; then
-    apr_charset_ebcdic=1
-  else
-    apr_charset_ebcdic=0
-  fi
-  AC_SUBST(apr_charset_ebcdic)
-])
-
-
-AC_DEFUN(APR_PREPARE_MM_DIR,[
-dnl #----------------------------- Prepare mm directory for VPATH support
-if test -n "$USE_MM" && test -n "$USE_VPATH"; then
-  test -d $mm_dir || $MKDIR $mm_dir
-
-  for i in shtool config.guess config.sub fbtool ltconfig \
-           ltmain.sh mm_vers.c; do
-    test -r $mm_dir/$i || ln -s $abs_srcdir/$mm_dir/$i $mm_dir/$i
-  done
-fi
-])
-
-
-AC_DEFUN(APR_CHECK_INET_ADDR,[
-AC_CACHE_CHECK(for inet_addr, ac_cv_func_inet_addr,[
-AC_TRY_COMPILE([
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
-],[
-inet_addr("127.0.0.1");
-],[
-    ac_cv_func_inet_addr=yes
-],[
-    ac_cv_func_inet_addr=no
-])
-])
-
-if test "$ac_cv_func_inet_addr" = "yes"; then
-  have_inet_addr=1
-else
-  have_inet_addr=0
-fi
-])
-
-
-AC_DEFUN(APR_CHECK_INET_NETWORK,[
-AC_CACHE_CHECK(for inet_network, ac_cv_func_inet_network,[
-AC_TRY_COMPILE([
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
-],[
-inet_network("127.0.0.1");
-],[
-    ac_cv_func_inet_network=yes
-],[
-    ac_cv_func_inet_network=no
-])
-])
-
-if test "$ac_cv_func_inet_network" = "yes"; then
-  have_inet_network=1
-else
-  have_inet_network=0
-fi
-])
-
-
-AC_DEFUN(APR_CHECK_SOCKADDR_IN6,[
-AC_CACHE_CHECK(for sockaddr_in6, ac_cv_define_sockaddr_in6,[
-AC_TRY_COMPILE([
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-],[
-struct sockaddr_in6 sa;
-],[
-    ac_cv_define_sockaddr_in6=yes
-],[
-    ac_cv_define_sockaddr_in6=no
-])
-])
-
-if test "$ac_cv_define_sockaddr_in6" = "yes"; then
-  have_sockaddr_in6=1
-else
-  have_sockaddr_in6=0
-fi
-])
-
-dnl
-dnl Check to see if this platform includes sa_len in it's
-dnl struct sockaddr.  If it does it changes the length of sa_family
-dnl which could cause us problems
-dnl
-AC_DEFUN(APR_CHECK_SOCKADDR_SA_LEN,[
-AC_CACHE_CHECK(for sockaddr sa_len, ac_cv_define_sockaddr_sa_len,[
-AC_TRY_COMPILE([
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-],[
-struct sockaddr_in sai;
-int i = sai.sin_len;
-],[
-  ac_cv_define_sockaddr_sa_len=yes
-],[
-  ac_cv_define_sockaddr_sa_len=no
-])
-])
-
-if test "$ac_cv_define_sockaddr_sa_len" = "yes"; then
-  AC_DEFINE(HAVE_SOCKADDR_SA_LEN, 1 ,[Define if we have length field in sockaddr_in])
-fi
-])
-
-
-dnl
-dnl APR_INADDR_NONE
-dnl
-dnl checks for missing INADDR_NONE macro
-dnl
-AC_DEFUN(APR_INADDR_NONE,[
-  AC_CACHE_CHECK(whether system defines INADDR_NONE, ac_cv_inaddr_none,[
-  AC_TRY_COMPILE([
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
-],[
-unsigned long foo = INADDR_NONE;
-],[
-    ac_cv_inaddr_none=yes
-],[
-    ac_cv_inaddr_none=no
-])])
-  if test "$ac_cv_inaddr_none" = "no"; then
-    apr_inaddr_none="((unsigned int) 0xffffffff)"
-  else
-    apr_inaddr_none="INADDR_NONE"
-  fi
-])
-
-
-dnl
-dnl APR_CHECK_H_ERRNO_FLAG
-dnl
-dnl checks which flags are necessary for <netdb.h> to define h_errno
-dnl
-AC_DEFUN(APR_H_ERRNO_COMPILE_CHECK,[
-  if test x$1 != x; then
-    CFLAGS="-D$1 $CFLAGS"
-  fi
-  AC_TRY_COMPILE([
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_NETDB_H
-#include <netdb.h>
-#endif
-],[
-int h_e = h_errno;
-],[
-  if test x$1 != x; then
-    ac_cv_h_errno_cflags="$1"
-  else
-    ac_cv_h_errno_cflags=yes
-  fi
-],[
-  ac_cv_h_errno_cflags=no
-])])
-AC_DEFUN(APR_CHECK_H_ERRNO_FLAG,[
-  AC_MSG_CHECKING([for h_errno in netdb.h])
-  AC_CACHE_VAL(ac_cv_h_errno_cflags,[
-    APR_H_ERRNO_COMPILE_CHECK
-    if test "$ac_cv_h_errno_cflags" = "no"; then
-      ac_save="$CFLAGS"
-      for flag in _XOPEN_SOURCE_EXTENDED; do
-        APR_H_ERRNO_COMPILE_CHECK($flag)
-        if test "$ac_cv_h_errno_cflags" != "no"; then
-          break
-        fi
-      done
-      CFLAGS="$ac_save"
-    fi
-  ])
-  if test "$ac_cv_h_errno_cflags" != "no"; then
-    if test "$ac_cv_h_errno_cflags" != "yes"; then
-      CFLAGS="-D$ac_cv_h_errno_cflags $CFLAGS"
-      AC_MSG_RESULT([yes, with -D$ac_cv_h_errno_cflags])
-    else
-      AC_MSG_RESULT([$ac_cv_h_errno_cflags])
-    fi
-  else
-    AC_MSG_RESULT([$ac_cv_h_errno_cflags])
-  fi
-])