[Bacula-commits] bacula/autoconf Make.common.in,1.15,1.16 configure.in,1.184,1.185

[Kern S. <ke...@us...>]

Update of /cvsroot/bacula/bacula/autoconf
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv985/autoconf

Modified Files:
	Make.common.in configure.in 
Log Message:
- Integrate libwrap patch from Szechuan Death. They should
  also fix bug 423.
- Clean up patches directory for next release.
- Add PS variable in bacula.in script as recommended by a user.
- Correct mtx-changer.in so it only creates a temp file when
  actually needed.
- Add patch supplied by user in a bug report to fix gnome2
  console buttons.
- Add patch from Peter Eriksson <pe...@if...> to correct
  NLS error in tray-monitor.c

Index: Make.common.in
===================================================================
RCS file: /cvsroot/bacula/bacula/autoconf/Make.common.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Make.common.in	12 Aug 2005 13:45:27 -0000	1.15
+++ Make.common.in	28 Sep 2005 19:24:56 -0000	1.16
@@ -55,6 +55,7 @@
 TTOOL_LDFLAGS = @TTOOL_LDFLAGS@
 #DEFS = @DEFS@ @LOCAL_DEFS@
 LIBS = @LIBS@
+WRAPLIBS = @WRAPLIBS@
 DINCLUDE = @DINCLUDE@
 DLIB = @DLIB@
 DB_LIBS = @DB_LIBS@

Index: configure.in
===================================================================
RCS file: /cvsroot/bacula/bacula/autoconf/configure.in,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -d -r1.184 -r1.185
--- configure.in	21 Aug 2005 08:40:45 -0000	1.184
+++ configure.in	28 Sep 2005 19:24:56 -0000	1.185
@@ -677,6 +677,7 @@
 # Check whether user wants TCP wrappers support (default off)
 # -----------------------------------------------------------
 TCPW_MSG="no" 
+WRAPLIBS=""
 AC_ARG_WITH(tcp-wrappers,
   [  --with-tcp-wrappers=DIR	 enable tcpwrappers support],
   [
@@ -686,7 +687,8 @@
        AC_MSG_CHECKING(for libwrap)
        AC_SEARCH_LIBS(nanosleep, [rt])
        AC_TRY_LINK(
-	  [ #include <tcpd.h>
+	  [ #include <sys/types.h>
+	    #include <tcpd.h>
 	     int deny_severity = 0;
 	     int allow_severity = 0;
 	     struct request_info *req; ],
@@ -695,10 +697,14 @@
 	    AC_MSG_RESULT(yes)
 	    AC_DEFINE(HAVE_LIBWRAP)
 	    TCPW_MSG="yes" 
+	    LIBS="$saved_LIBS"
+	    WRAPLIBS="-lwrap"
 	  ], [
 	    LIBS="$saved_LIBS -lwrap -lnsl"
+	    WRAPLIBS="$saved_LIBS -lwrap -lnsl"
 	    AC_TRY_LINK(
-	      [ #include <tcpd.h>
+	      [ #include <sys/types.h>
+		 #include <tcpd.h>
 		 int deny_severity = 0;
 		 int allow_severity = 0;
 		 struct request_info *req; ],
@@ -707,6 +713,8 @@
 		 AC_MSG_RESULT(yes)
 		 AC_DEFINE(HAVE_LIBWRAP)
 		 TCPW_MSG="yes" 
+		 LIBS="$saved_LIBS"
+		 WRAPLIBS="-lwrap"
 	      ],
 	      [AC_MSG_ERROR([*** libwrap missing]) ] ]
 	    )
@@ -1603,6 +1611,7 @@
 AC_SUBST(X_EXTRA_LIBS)
 AC_SUBST(WCFLAGS)
 AC_SUBST(WLDFLAGS)
+AC_SUBST(WRAPLIBS)
 
 dnl# extra configurable objects
 OBJLIST=
@@ -2091,7 +2100,7 @@
   Large file support:	      $largefile_support
   Bacula conio support:       ${got_conio} ${CONS_LIBS}
   readline support:	      ${got_readline} ${PRTREADLINE_SRC}
-  TCP Wrappers support:       ${TCPW_MSG}
+  TCP Wrappers support:       ${TCPW_MSG} ${WRAPLIBS}
   TLS support:		      ${support_tls}
   ZLIB support: 	      ${have_zlib}
   enable-smartalloc:	      ${support_smartalloc}