updates.

[crypto.git] / configure.in.pre

diff --git a/configure.in.pre b/configure.in.pre
index 2af2d3fe008db21e5c3c8729d7674976377e1308..7b245dd0b028ebad0cfd04de7c64078d458aab34 100644 (file)
--- a/configure.in.pre
+++ b/configure.in.pre
@@ -34,7 +34,7 @@ case "$target" in
 esac
 
 # ./prepare script will automatically put the correct version. Do not edit!
-AM_INIT_AUTOMAKE(silc, SILC_VERSION)
+AM_INIT_AUTOMAKE(SILC_PACKAGE, SILC_VERSION)
 AC_PREREQ(2.3)
 AM_CONFIG_HEADER(includes/silcdefs.h)
 
@@ -352,6 +352,7 @@ AC_ARG_WITH(gmp,
     AC_CHECK_HEADER(gmp.h,
       AC_CHECK_LIB(gmp, __gmpz_init,
         AM_CONDITIONAL(SILC_BUILD_GMP, test x$withval = yes)
+        LIBS="$LIBS -L/usr/lib -L/usr/local/lib -lgmp"
         AC_MSG_RESULT(GMP will not be compiled),
         AM_CONDITIONAL(SILC_BUILD_GMP, test x$withval != yes)
         AC_MSG_RESULT(GMP will be compiled)
@@ -365,6 +366,7 @@ esac ], [
     AC_CHECK_LIB(gmp, __gmpz_init,
       build_gmp=false
       AM_CONDITIONAL(SILC_BUILD_GMP, test x$build_gmp = xtrue)
+      LIBS="$LIBS -L/usr/lib -L/usr/local/lib -lgmp"
       AC_MSG_RESULT(GMP will not be compiled),
       build_gmp=true
       AM_CONDITIONAL(SILC_BUILD_GMP, test x$build_gmp = xtrue)
@@ -382,18 +384,25 @@ AC_ARG_WITH(silcd-config-file,
                           server [/etc/silc/silcd.conf]],
 [ AC_DEFINE_UNQUOTED(SILC_SERVER_CONFIG_FILE, "$withval") ])
 
-# XXX
-#LIBS="$LIBS -lefence"
-
+#
 # Other configure scripts
+#
 AC_CONFIG_SUBDIRS(irssi)
 AC_CONFIG_SUBDIRS(lib/dotconf)
 AC_CONFIG_SUBDIRS(lib/silcmath/gmp)
 AC_CONFIG_SUBDIRS(lib/trq)
 #AC_CONFIG_SUBDIRS(lib/zlib)
 
+SILC_TOP_SRCDIR=`pwd`
+AC_SUBST(SILC_TOP_SRCDIR)
+AC_SUBST(LIBS)
+
+#
+# Makefile outputs
+#
 AC_OUTPUT( \
 Makefile
+Makefile.defines
 doc/Makefile
 includes/Makefile
 lib/Makefile