update

diff --git a/apps/silc/Makefile.am b/apps/silc/Makefile.am
index ce3f90f98a56aa83cae4245550e94212d5d89c70..6c6d109a22841c19d54e37b22c9e6db25329807a 100644 (file)
--- a/apps/silc/Makefile.am
+++ b/apps/silc/Makefile.am
@@ -30,7 +30,12 @@ silc_SOURCES = \
 
 silc_DEPENDENCIES = ../lib/libsilcclient.a ../lib/libsilc.a
 
+if SILC_BUILD_GMP
 LDADD = -L. -L.. -L../lib -lsilcclient -lsilc -lcurses
+else
+LDADD = -L. -L.. -L../lib -lsilcclient -lsilc -lcurses -L/usr/lib \
+       -L/usr/local/lib -lgmp
+endif
 
 EXTRA_DIST = *.h
 

diff --git a/apps/silcd/Makefile.am b/apps/silcd/Makefile.am
index df9283c3d1e29a9d4b0d1e4e4b933a302b87a239..b3ca5ab1399f5f3a8d13eb0a4440ae5355c9c50c 100644 (file)
--- a/apps/silcd/Makefile.am
+++ b/apps/silcd/Makefile.am
@@ -36,7 +36,11 @@ silcd_SOURCES = \
 
 silcd_DEPENDENCIES = ../lib/libsilc.a
 
+if SILC_BUILD_GMP
 LDADD = -L. -L.. -L../lib -lsilc
+else
+LDADD = -L. -L.. -L../lib -lsilc -L/usr/lib -L/usr/local/lib -lgmp
+endif
 
 EXTRA_DIST = *.h
 

diff --git a/configure.in.pre b/configure.in.pre
index 3548a2eb4f9430df060abbf6b8284c5d4143b892..41567de7a03bbfada9f6f9ac76b41f34cc2a65fb 100644 (file)
--- a/configure.in.pre
+++ b/configure.in.pre
@@ -219,6 +219,42 @@ if test "x$socks" = "x5"; then
   AC_DEFINE(Rgethostbyname, SOCKSgethostbyname)
 fi
 
+# GMP Library checking
+AC_MSG_CHECKING(whether to compile GMP)
+AC_ARG_WITH(gmp,
+[  --with-gmp              Build the GMP in the SILC source tree],
+[ case "${withval}" in
+  yes) 
+    AM_CONDITIONAL(SILC_BUILD_GMP, test x$withval = xyes)
+    AC_MSG_RESULT(yes)
+    ;;
+  *)
+    AC_CHECK_HEADER(gmp.h,
+      AC_CHECK_LIB(gmp, __gmpz_init,
+        AM_CONDITIONAL(SILC_BUILD_GMP, test x$withval = yes)
+        AC_MSG_RESULT(no),
+        AM_CONDITIONAL(SILC_BUILD_GMP, test x$withval != yes)
+        AC_MSG_RESULT(yes)
+      ),
+      AM_CONDITIONAL(SILC_BUILD_GMP, test x$withval != yes)
+      AC_MSG_RESULT(yes)
+    )
+    ;;
+esac ], [
+  AC_CHECK_HEADER(gmp.h,
+    AC_CHECK_LIB(gmp, __gmpz_init,
+      build_gmp=false
+      AM_CONDITIONAL(SILC_BUILD_GMP, test x$build_gmp = xtrue)
+      AC_MSG_RESULT(no),
+      build_gmp=true
+      AM_CONDITIONAL(SILC_BUILD_GMP, test x$build_gmp = xtrue)
+      AC_MSG_RESULT(yes)
+    ),
+    build_gmp=true
+    AM_CONDITIONAL(SILC_BUILD_GMP, test x$build_gmp = xtrue)
+    AC_MSG_RESULT(yes)
+  )
+])
 
 AC_ARG_WITH(silcd-config-file,
 [  --with-silcd-config-file[=PATH]
@@ -231,9 +267,9 @@ AC_ARG_WITH(silcd-config-file,
 
 # Other configure scripts
 #AC_CONFIG_SUBDIRS(lib/zlib)
-AC_CONFIG_SUBDIRS(lib/dotconf)
-AC_CONFIG_SUBDIRS(lib/silcmath/gmp)
-AC_CONFIG_SUBDIRS(lib/trq)
+#AC_CONFIG_SUBDIRS(lib/dotconf)
+#AC_CONFIG_SUBDIRS(lib/silcmath/gmp)
+#AC_CONFIG_SUBDIRS(lib/trq)
 
 AC_OUTPUT( \
 Makefile

diff --git a/lib/silcmath/Makefile.am b/lib/silcmath/Makefile.am
index 91be08de53f680ed2efdfb799afe3c2f9d3257a2..89d3ff3c6759be8a7a896dc843ba83b8e356050a 100644 (file)
--- a/lib/silcmath/Makefile.am
+++ b/lib/silcmath/Makefile.am
@@ -18,7 +18,11 @@
 
 AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
 
+if SILC_BUILD_GMP
 SUBDIRS = gmp
+else
+SUBDIRS =
+endif
 
 noinst_LIBRARIES = libsilcmath.a