fix build for Solaris

[citadel.git] / citadel / configure.ac

diff --git a/citadel/configure.ac b/citadel/configure.ac
index c331e5a4a998f90d455ba18f4108109b68bad4b6..b18a71902c4a59a33354f47dda6f639df0dcfdc3 100644 (file)
--- a/citadel/configure.ac
+++ b/citadel/configure.ac
@@ -111,7 +111,6 @@ if test "$GCC" = yes; then
                ;;
        esac
 fi
-AC_DISABLE_STATIC
 AC_PROG_INSTALL
 AC_PROG_YACC
 missing_dir=`cd $ac_aux_dir && pwd`
@@ -349,7 +348,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 +403,7 @@ main() {
 }
                ], 
                [
-                       LIBS="-lical $LIBS"
+                       SERVER_LIBS="-lical $SERVER_LIBS"
                        AC_DEFINE(HAVE_LIBICAL)
                ]
        )
@@ -562,6 +561,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])