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

diff --git a/source/lib/replace/configure.ac b/source/lib/replace/configure.ac
index f5e054f4767379ef98714c306638cf8003c9917e..298f5a67f94c7094d676c7f25a65957ea47af22a 100644 (file)
--- a/source/lib/replace/configure.ac
+++ b/source/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/source/lib/replace/getifaddrs.m4 b/source/lib/replace/getifaddrs.m4
index c79367fe4ffcb9afe7477213a88dd4817f9c603d..f4cf4e48a2f6d4ac7f685c7ccb964ccaee37a6c0 100644 (file)
--- a/source/lib/replace/getifaddrs.m4
+++ b/source/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