[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-2538-g5c08730

[Michael Adam]

The branch, v3-2-test has been updated
       via  5c08730f1938b8c56b70554378051d88d174c061 (commit)
       via  f162de7b8012d29408060610a969ca76c61a4c80 (commit)
       via  66d4c38967e0d420929d4e1fdab0590161d526bc (commit)
      from  4a0d1ad601facf158db0c1d1c320e9e1369093d0 (commit)

http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 5c08730f1938b8c56b70554378051d88d174c061
Author: Michael Adam <obnox at samba.org>
Date:   Wed Feb 27 10:33:32 2008 +0100

    libreplace: standalone build: use -I$srcdir instead of -I.
    
    Michael

commit f162de7b8012d29408060610a969ca76c61a4c80
Author: Michael Adam <obnox at samba.org>
Date:   Wed Feb 27 01:41:30 2008 +0100

    libreplace: fix standalone build - add necessary libs.
    
    The libs needed for getifaddrs replacements have to be added
    to LIBS and used for the testsuite target.
    
    Michael

commit 66d4c38967e0d420929d4e1fdab0590161d526bc
Author: Michael Adam <obnox at samba.org>
Date:   Wed Feb 27 01:29:12 2008 +0100

    libreplace: fix standalone build on some systems.
    
    getifaddr tests include system/network.h, which does not
    find getaddrinfo.h without "-I.".
    
    Michael

-----------------------------------------------------------------------

Summary of changes:
 source/lib/replace/Makefile.in   |    4 +++-
 source/lib/replace/configure.ac  |    2 ++
 source/lib/replace/getifaddrs.m4 |    3 +++
 3 files changed, 8 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/replace/Makefile.in b/source/lib/replace/Makefile.in
index 30f39ac..af9522f 100644
--- a/source/lib/replace/Makefile.in
+++ b/source/lib/replace/Makefile.in
@@ -10,6 +10,7 @@ VPATH = @libreplacedir@
 srcdir = @srcdir@
 builddir = @builddir@
 INSTALL = @INSTALL@
+LIBS = @LIBS@
 
 .PHONY: test all showflags install installcheck clean distclean realdistclean
 
@@ -25,6 +26,7 @@ showflags:
 	@echo '  CC     = $(CC)'
 	@echo '  CFLAGS = $(CFLAGS)'
 	@echo '  LDFLAGS= $(LDFLAGS)'
+	@echo '  LIBS   = $(LIBS)'
 
 install: all
 	mkdir -p $(libdir)
@@ -41,7 +43,7 @@ installcheck: install test
 TEST_OBJS = test/testsuite.o test/os2_delete.o test/strptime.o
 
 testsuite: libreplace.a $(TEST_OBJS)
-	$(CC) -o testsuite $(TEST_OBJS) -L. -lreplace $(LDFLAGS)
+	$(CC) -o testsuite $(TEST_OBJS) -L. -lreplace $(LDFLAGS) $(LIBS)
 
 .c.o:
 	@echo Compiling $*.c
diff --git a/source/lib/replace/configure.ac b/source/lib/replace/configure.ac
index beeb77e..f5e054f 100644
--- a/source/lib/replace/configure.ac
+++ b/source/lib/replace/configure.ac
@@ -3,6 +3,8 @@ AC_INIT(replace.c)
 AC_CONFIG_SRCDIR([replace.c])
 AC_CONFIG_HEADER(config.h)
 
+CFLAGS="$CFLAGS -I$srcdir"
+
 AC_LIBREPLACE_ALL_CHECKS
 
 if test "$ac_cv_prog_gcc" = yes; then
diff --git a/source/lib/replace/getifaddrs.m4 b/source/lib/replace/getifaddrs.m4
index dd2a95c..767797e 100644
--- a/source/lib/replace/getifaddrs.m4
+++ b/source/lib/replace/getifaddrs.m4
@@ -71,6 +71,7 @@ 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
 
@@ -87,6 +88,7 @@ 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
 
@@ -102,6 +104,7 @@ 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
 


-- 
Samba Shared Repository