diff options
| author | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-19 09:06:14 -0500 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2007-10-19 13:09:00 -0700 |
| commit | 61c4666a897fc85b0eb41e60dcbeb78272bfe5cf (patch) | |
| tree | 431629edaf6416d62e9a90db25a7c99457b881be | |
| parent | 60952803044e098682c150b7ed91d4da87f5bb79 (diff) | |
| download | samba-61c4666a897fc85b0eb41e60dcbeb78272bfe5cf.tar.gz samba-61c4666a897fc85b0eb41e60dcbeb78272bfe5cf.tar.bz2 samba-61c4666a897fc85b0eb41e60dcbeb78272bfe5cf.zip | |
Move the test for the AIX specific interface code to the end.
This tests goes into an infinite loop on OS X so avoid it.
Probably should also be only conditionaly be run on AIX in the
first place.
(This used to be commit 641d0968da73dca24a3ddaf93451de1200d3c09b)
| -rw-r--r-- | source3/configure.in | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/source3/configure.in b/source3/configure.in index 22989dbe53..5d236237a1 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -2962,23 +2962,6 @@ fi ################## # look for a method of finding the list of network interfaces iface=no; -AC_CACHE_CHECK([for iface AIX],samba_cv_HAVE_IFACE_AIX,[ -SAVE_CPPFLAGS="$CPPFLAGS" -CPPFLAGS="$CPPFLAGS ${SAMBA_CONFIGURE_CPPFLAGS}" -AC_TRY_RUN([ -#define NO_CONFIG_H 1 -#define HAVE_IFACE_AIX 1 -#define AUTOCONF_TEST 1 -#undef _XOPEN_SOURCE_EXTENDED -#include "${srcdir-.}/lib/replace/replace.c" -#include "${srcdir-.}/lib/interfaces.c"], - samba_cv_HAVE_IFACE_AIX=yes,samba_cv_HAVE_IFACE_AIX=no,samba_cv_HAVE_IFACE_AIX=cross)]) -CPPFLAGS="$SAVE_CPPFLAGS" -if test x"$samba_cv_HAVE_IFACE_AIX" = x"yes"; then - iface=yes;AC_DEFINE(HAVE_IFACE_AIX,1,[Whether iface AIX is available]) -fi - -if test $iface = no; then AC_CACHE_CHECK([for iface getifaddrs],samba_cv_HAVE_IFACE_GETIFADDRS,[ SAVE_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS ${SAMBA_CONFIGURE_CPPFLAGS}" @@ -2993,7 +2976,6 @@ CPPFLAGS="$SAVE_CPPFLAGS" if test x"$samba_cv_HAVE_IFACE_GETIFADDRS" = x"yes"; then iface=yes;AC_DEFINE(HAVE_IFACE_GETIFADDRS,1,[Whether iface getifaddrs is available]) fi -fi if test $iface = no; then AC_CACHE_CHECK([for iface ifconf],samba_cv_HAVE_IFACE_IFCONF,[ @@ -3029,6 +3011,24 @@ if test x"$samba_cv_HAVE_IFACE_IFREQ" = x"yes"; then fi fi +if test $iface = no; then +AC_CACHE_CHECK([for iface AIX],samba_cv_HAVE_IFACE_AIX,[ +SAVE_CPPFLAGS="$CPPFLAGS" +CPPFLAGS="$CPPFLAGS ${SAMBA_CONFIGURE_CPPFLAGS}" +AC_TRY_RUN([ +#define NO_CONFIG_H 1 +#define HAVE_IFACE_AIX 1 +#define AUTOCONF_TEST 1 +#undef _XOPEN_SOURCE_EXTENDED +#include "${srcdir-.}/lib/replace/replace.c" +#include "${srcdir-.}/lib/interfaces.c"], + samba_cv_HAVE_IFACE_AIX=yes,samba_cv_HAVE_IFACE_AIX=no,samba_cv_HAVE_IFACE_AIX=cross)]) +CPPFLAGS="$SAVE_CPPFLAGS" +if test x"$samba_cv_HAVE_IFACE_AIX" = x"yes"; then + iface=yes;AC_DEFINE(HAVE_IFACE_AIX,1,[Whether iface AIX is available]) +fi +fi + dnl test for ipv6 AC_CACHE_CHECK([for ipv6 support],samba_cv_HAVE_IPV6,[ AC_TRY_COMPILE([ |