* build system: link Berkeley DB only to the server, not to the client & utils

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index b4afc6cbd535d93b10887c5a39055a231cb88e2b..872ebd5e3644f0aa59d91c666cd5c12882b816d3 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 608.4  2003/07/20 20:46:06  ajc
+ * build system: link Berkeley DB only to the server, not to the client & utils
+
  Revision 608.3  2003/07/20 03:51:46  ajc
  * setup.c: offer to disable sendmail, postfix, and qmail if found (only if
    using the /etc/init.d type of startup scripts)
@@ -4878,3 +4881,4 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import
+

diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index fcfc6812c6567d367e52495bf26e2be01dfd93d9..53a283d55d524d940276b1a181db52bba478eeb4 100644 (file)
--- a/citadel/Makefile.in
+++ b/citadel/Makefile.in
@@ -68,6 +68,7 @@ INSTALL_DATA=@INSTALL_DATA@
 RESOLV=@RESOLV@
 SHELL=/bin/sh
 SERVER_LDFLAGS=@SERVER_LDFLAGS@
+SERVER_LIBS=@SERVER_LIBS@
 SETUP_LIBS=@SETUP_LIBS@
 YACC=@YACC@
 
@@ -129,7 +130,7 @@ SERV_OBJS = server_main.o \
        clientsocket.o $(AUTH) $(SERV_MODULES)
 
 citserver: $(SERV_OBJS)
-       $(CC) $(SERV_OBJS) $(LDFLAGS) $(SERVER_LDFLAGS) $(LIBS) $(RESOLV) -o citserver
+       $(CC) $(SERV_OBJS) $(LDFLAGS) $(SERVER_LDFLAGS) $(LIBS) $(SERVER_LIBS) $(RESOLV) -o citserver
 
 .c.o:
        $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@

diff --git a/citadel/acinclude.m4 b/citadel/acinclude.m4
index ad9663b49120794bfa85f120d0f001929d2ab264..0941acf0b345e8200d76ec7d93d9981a71532740 100644 (file)
--- a/citadel/acinclude.m4
+++ b/citadel/acinclude.m4
@@ -35,6 +35,8 @@ do
       ])
    AS_IF([test AS_VAR_GET(ac_tr_db) = yes],
          [$2
+         LIBS="$bogo_saved_LIBS"
+         SERVER_LIBS="$SERVER_LIBS -l$lib"
           db=yes],
          [LIBS="$bogo_saved_LIBS"
           db=no])

diff --git a/citadel/configure.ac b/citadel/configure.ac
index c331e5a4a998f90d455ba18f4108109b68bad4b6..d95d0968ead8487858ca1ad8ac8f0ff95bd1d182 100644 (file)
--- a/citadel/configure.ac
+++ b/citadel/configure.ac
@@ -349,7 +349,7 @@ if test "x$with_zlib" != xno ; then
 fi
 
 if test "x$ok_zlib" = xyes ; then
-       LIBS="-lz $LIBS"
+       SERVER_LIBS="-lz $SERVER_LIBS"
        AC_DEFINE(HAVE_ZLIB)
 fi
 
@@ -404,7 +404,7 @@ main() {
 }
                ], 
                [
-                       LIBS="-lical $LIBS"
+                       SERVER_LIBS="-lical $SERVER_LIBS"
                        AC_DEFINE(HAVE_LIBICAL)
                ]
        )
@@ -562,6 +562,7 @@ AC_SUBST(chkpwd_LIBS)
 AC_SUBST(TARGETS)
 AC_SUBST(DATABASE)
 AC_SUBST(SERVER_LDFLAGS)
+AC_SUBST(SERVER_LIBS)
 AC_SUBST(SETUP_LIBS)
 AC_CONFIG_HEADER(sysdep.h)
 AC_CONFIG_FILES([Makefile weekly])