updates.

diff --git a/CHANGES b/CHANGES
index 61012997557118e9135f2e056f786bb7fcbde0f0..fac02d84abf0e666c31464138fc7e1680939e47d 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,10 @@
+Wed Mar 10 21:30:02 EET 2004  Pekka Riikonen <priikone@silcnet.org>
+
+       * Create one configure script from configure fragments
+         (configure.ad).  This is a first step towards new distribution
+         system.  Affected files prepare, configure.in.pre,
+         lib/silcmath/mpi/configure.ad.
+
 Wed Mar 10 18:35:24 CET 2004  Jochen Eisinger <jochen@penguin-breeder.org>
 
        * Removed expiring of client key pair.  Affected file is

diff --git a/configure.in.pre b/configure.in.pre
index c2e6e08b814d71f3621e993dda87f430063fb1a9..2c66f012feb91b5100c3a673f5f8c7d614942a8d 100644 (file)
--- a/configure.in.pre
+++ b/configure.in.pre
@@ -307,16 +307,16 @@ AC_ARG_ENABLE(stack-trace,
 # Disable all assembler optimizations
 #
 AC_MSG_CHECKING(whether to enable assembler optimizations)
-want_asm="yes"
+want_asm=true
 AC_ARG_ENABLE(asm,
   [  --disable-asm           do not use assembler optimizations],
   [
     AC_MSG_RESULT(no)
-    want_asm="no"
+    want_asm=false
   ],
   [
     AC_MSG_RESULT(yes)
-    want_asm="yes"
+    want_asm=true
   ])
 
 
@@ -330,7 +330,7 @@ AC_DEFUN(SILC_ADD_CFLAGS,
 [ tmp_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS $1"
   AC_MSG_CHECKING(whether $CC accepts $1 flag)
-  AC_TRY_LINK(, , AC_MSG_RESULT(yes), [AC_MSG_RESULT(no)
+  AC_TRY_LINK([], [], AC_MSG_RESULT(yes), [AC_MSG_RESULT(no)
                                       CFLAGS="$tmp_CFLAGS"
                                       $2])
   unset tmp_CFLAGS
@@ -1244,7 +1244,12 @@ fi
 echo " SIM support ...................: $sim_support"
 echo " IPv6 support ..................: $summary_ipv6"
 echo " Iconv support .................: $iconv_support"
-echo " Assembler optimizations .......: $want_asm"
+if test x$want_asm = xfalse; then
+  summary_asm="no"
+else
+  summary_asm="yes"
+fi
+echo " Assembler optimizations .......: $summary_asm"
 
 mp="MPI"
 if test x$mp_gmp = xtrue; then

diff --git a/prepare b/prepare
index f72a5f5959143ae9ddcc53eb33225f98c67326f2..219d718b018c48718a690938dae6fe58e5948c18 100755 (executable)
--- a/prepare
+++ b/prepare
@@ -50,7 +50,7 @@ SILC_VERSION=0.9.12                   # Base version
 #
 # Arguments: ad_make_configure <main_configure_file>
 #
-function ad_make_configure()
+ad_make_configure()
 {
   rm -f configure.in
 
@@ -158,17 +158,6 @@ autoheader >/dev/null 2>/dev/null
 libtoolize --automake --copy
 automake
 
-#echo "Preparing mpi"
-#cp Makefile.defines.in lib/silcmath/mpi
-#cp Makefile.defines_int.in lib/silcmath/mpi
-#cd lib/silcmath/mpi
-#aclocal
-#autoconf
-#autoheader >/dev/null 2>/dev/null
-#libtoolize --automake --copy
-#automake >/dev/null 2>/dev/null
-#cd ../../..
-
 file=includes/version_internal.h
 echo "/* Automatically generated by ./prepare */" >$file
 echo "#define SILC_VERSION_STRING \"$dist_version\"" >>$file