diff options
| author | Michael Adam <obnox@samba.org> | 2008-03-14 09:39:58 +0100 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2008-03-14 11:33:02 +0100 |
| commit | 59d6feb469bcc257162bac4bd232ef2f5d210a71 (patch) | |
| tree | d2755f648e77d7a0805b6baa69418cc66192ac5a | |
| parent | fd6513fc4205f12c22f5130df65a1e8033284e67 (diff) | |
| download | samba-59d6feb469bcc257162bac4bd232ef2f5d210a71.tar.gz samba-59d6feb469bcc257162bac4bd232ef2f5d210a71.tar.bz2 samba-59d6feb469bcc257162bac4bd232ef2f5d210a71.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
(cherry picked from commit ff3af1703ddc9e5383f32156bc5be8351f795e76)
(This used to be commit 2546da817f666914c1c220ec1fedc19aa41b25ad)
| -rw-r--r-- | source3/lib/replace/configure.ac | 3 | ||||
| -rw-r--r-- | source3/lib/replace/getifaddrs.m4 | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source3/lib/replace/configure.ac b/source3/lib/replace/configure.ac index f5e054f476..298f5a67f9 100644 --- a/source3/lib/replace/configure.ac +++ b/source3/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/source3/lib/replace/getifaddrs.m4 b/source3/lib/replace/getifaddrs.m4 index c79367fe4f..f4cf4e48a2 100644 --- a/source3/lib/replace/getifaddrs.m4 +++ b/source3/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 |