summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-03-14 09:39:58 +0100
committerMichael Adam <obnox@samba.org>2008-03-14 09:39:58 +0100
commit4b2aee2cd6fd38b2eecf6a3102d001dc8a1e860e (patch)
treefcee3d60ef1b4c6d1f2f14dd552457c5b7957e12 /source4
parent9d0b13bfcc44b7f886b42b25dd65d10c46fddb40 (diff)
downloadsamba-4b2aee2cd6fd38b2eecf6a3102d001dc8a1e860e.tar.gz
samba-4b2aee2cd6fd38b2eecf6a3102d001dc8a1e860e.tar.bz2
samba-4b2aee2cd6fd38b2eecf6a3102d001dc8a1e860e.zip
libreplace: fix samba4 build (by not setting global LIBS).
This corrects the earlier fix of the standalone build, by setting LIBS to the desired value only in configure.ac but not in getifaddrs.m4. Not that this changes the standalone build in that it adds these libs undconditionally and not only if they are needed by the getifaddrs replacement functions. Michael (This used to be commit ff3af1703ddc9e5383f32156bc5be8351f795e76)
Diffstat (limited to 'source4')
-rw-r--r--source4/lib/replace/configure.ac3
-rw-r--r--source4/lib/replace/getifaddrs.m43
2 files changed, 3 insertions, 3 deletions
diff --git a/source4/lib/replace/configure.ac b/source4/lib/replace/configure.ac
index f5e054f476..298f5a67f9 100644
--- a/source4/lib/replace/configure.ac
+++ b/source4/lib/replace/configure.ac
@@ -21,6 +21,9 @@ if test "$ac_cv_prog_gcc" = yes; then
CFLAGS="$CFLAGS -Wno-format-y2k"
fi
+LIBS="$SOCKET_LIBS $NSL_LIBS"
+AC_SUBST(LIBS)
+
AC_SUBST(LDFLAGS)
AC_OUTPUT(Makefile)
diff --git a/source4/lib/replace/getifaddrs.m4 b/source4/lib/replace/getifaddrs.m4
index c79367fe4f..f4cf4e48a2 100644
--- a/source4/lib/replace/getifaddrs.m4
+++ b/source4/lib/replace/getifaddrs.m4
@@ -81,7 +81,6 @@ AC_TRY_RUN([
libreplace_cv_HAVE_IFACE_AIX=yes,libreplace_cv_HAVE_IFACE_AIX=no,libreplace_cv_HAVE_IFACE_AIX=cross)])
if test x"$libreplace_cv_HAVE_IFACE_AIX" = x"yes"; then
iface=yes;AC_DEFINE(HAVE_IFACE_AIX,1,[Whether iface AIX is available])
- old_LIBS="$old_LIBS $LIBS"
fi
fi
@@ -102,7 +101,6 @@ AC_TRY_RUN([
libreplace_cv_HAVE_IFACE_IFCONF=yes,libreplace_cv_HAVE_IFACE_IFCONF=no,libreplace_cv_HAVE_IFACE_IFCONF=cross)])
if test x"$libreplace_cv_HAVE_IFACE_IFCONF" = x"yes"; then
iface=yes;AC_DEFINE(HAVE_IFACE_IFCONF,1,[Whether iface ifconf is available])
- old_LIBS="$old_LIBS $LIBS"
fi
fi
@@ -122,7 +120,6 @@ AC_TRY_RUN([
libreplace_cv_HAVE_IFACE_IFREQ=yes,libreplace_cv_HAVE_IFACE_IFREQ=no,libreplace_cv_HAVE_IFACE_IFREQ=cross)])
if test x"$libreplace_cv_HAVE_IFACE_IFREQ" = x"yes"; then
iface=yes;AC_DEFINE(HAVE_IFACE_IFREQ,1,[Whether iface ifreq is available])
- old_LIBS="$old_LIBS $LIBS"
fi
fi