Channel/Private Message unify updates.
[silc.git] / configure.in.pre
index 86305afeb96700d5290e8448ba6f1c6e49536527..0e37c1a45cf73d6a365d10ac82f91e73dd74709b 100644 (file)
@@ -60,6 +60,7 @@ if test "$GCC"; then
   CFLAGS="-Wall -finline-functions $CFLAGS"
 fi
 
+#
 # Program checking
 #
 AC_PROG_INSTALL
@@ -92,17 +93,17 @@ AC_TYPE_UID_T
 AC_TYPE_PID_T
 
 AC_CHECK_SIZEOF(long long, 0)
-AC_DEFINE_UNQUOTED(SILC_SIZEOF_LONG_LONG, $ac_cv_sizeof_long_long)
+AC_SUBST(SILC_SIZEOF_LONG_LONG, $ac_cv_sizeof_long_long)
 AC_CHECK_SIZEOF(long, 0)
-AC_DEFINE_UNQUOTED(SILC_SIZEOF_LONG, $ac_cv_sizeof_long)
+AC_SUBST(SILC_SIZEOF_LONG, $ac_cv_sizeof_long)
 AC_CHECK_SIZEOF(int, 0)
-AC_DEFINE_UNQUOTED(SILC_SIZEOF_INT, $ac_cv_sizeof_int)
+AC_SUBST(SILC_SIZEOF_INT, $ac_cv_sizeof_int)
 AC_CHECK_SIZEOF(short, 0)
-AC_DEFINE_UNQUOTED(SILC_SIZEOF_SHORT, $ac_cv_sizeof_short)
+AC_SUBST(SILC_SIZEOF_SHORT, $ac_cv_sizeof_short)
 AC_CHECK_SIZEOF(char, 0)
-AC_DEFINE_UNQUOTED(SILC_SIZEOF_CHAR, $ac_cv_sizeof_char)
+AC_SUBST(SILC_SIZEOF_CHAR, $ac_cv_sizeof_char)
 AC_CHECK_SIZEOF(void *, 0)
-AC_DEFINE_UNQUOTED(SILC_SIZEOF_VOID_P, $ac_cv_sizeof_void_p)
+AC_SUBST(SILC_SIZEOF_VOID_P, $ac_cv_sizeof_void_p)
 
 # Function and library checking
 #
@@ -176,12 +177,14 @@ AC_ARG_ENABLE(ipv6,
       yes)
         want_ipv6=true
         check_ipv6=false
+       summary_ipv6="yes"
         AC_DEFINE(HAVE_IPV6)
         AC_MSG_RESULT(yes)
         ;;
       *)
         want_ipv6=false
         check_ipv6=false
+       summary_ipv6="no"
         AC_MSG_RESULT(no)
         ;;
     esac
@@ -190,8 +193,12 @@ AC_ARG_ENABLE(ipv6,
   )
 
 if test x$check_ipv6 = xtrue; then
+  summary_ipv6="no"
   AC_TRY_COMPILE(
     [
+      #ifdef HAVE_SYS_TYPES_H
+      #include <sys/types.h>
+      #endif
       #ifdef HAVE_NETINET_TCP_H
       #include <netinet/tcp.h>
       #endif
@@ -199,7 +206,7 @@ if test x$check_ipv6 = xtrue; then
       #include <netdb.h>
       #endif
       #include <sys/socket.h>
-      #ifdef HAVE_NETDB_IN_H
+      #ifdef HAVE_NETINET_IN_H
       #include <netinet/in.h>
       #endif
     ],
@@ -210,6 +217,7 @@ if test x$check_ipv6 = xtrue; then
     [
       AC_DEFINE(HAVE_IPV6)
       AC_MSG_RESULT(yes)
+      summary_ipv6="yes"
     ],
       AC_MSG_RESULT(no)
     )
@@ -218,6 +226,7 @@ fi
 # Debug checking
 #
 AC_MSG_CHECKING(whether to enable debugging)
+summary_debug="no"
 AC_ARG_ENABLE(debug,
   [  --enable-debug          enable debugging],
   [
@@ -226,6 +235,7 @@ AC_ARG_ENABLE(debug,
         AC_MSG_RESULT(yes)
         AC_DEFINE(SILC_DEBUG)
         CFLAGS="-O -g $CFLAGS"
+       summary_debug="yes"
         ;;
       *)
         AC_MSG_RESULT(no)
@@ -241,6 +251,7 @@ AC_ARG_ENABLE(debug,
 # Stack trace checking
 #
 AC_MSG_CHECKING(whether to enable stack tracing)
+summary_stacktrace="no"
 AC_ARG_ENABLE(stack-trace,
   [  --enable-stack-trace    enable memory stack trace],
   [
@@ -248,6 +259,7 @@ AC_ARG_ENABLE(stack-trace,
     yes)
       AC_MSG_RESULT(yes)
       AC_DEFINE(SILC_STACKTRACE)
+      summary_stacktrace="yes"
       ;;
     *)
       AC_MSG_RESULT(no)
@@ -260,6 +272,7 @@ AC_ARG_ENABLE(stack-trace,
 # Disable all assembler optimizations
 #
 AC_MSG_CHECKING(whether to enable assembler optimizations)
+summary_asm="no"
 AC_ARG_ENABLE(asm,
   [  --disable-asm           do not use assembler optimizations],
   [
@@ -267,6 +280,7 @@ AC_ARG_ENABLE(asm,
   ],
   [
     AC_MSG_RESULT(yes)
+    summary_asm="yes"
   ])
 
 
@@ -295,7 +309,7 @@ AC_ARG_WITH(etcdir,
   [[  --with-etcdir=DIR       directory for system files [/etc/silc]]],
   [
     case "$withval" in
-      no)
+      no|yes)
         ;;
       *)
         ETCDIR="$withval"
@@ -312,7 +326,7 @@ AC_ARG_WITH(helpdir,
   [[  --with-helpdir=DIR      directory for SILC help files [PREFIX/help]]],
   [
     case "$withval" in
-      no)
+      no|yes)
         ;;
       *)
        HELPDIR="$withval"
@@ -329,7 +343,7 @@ AC_ARG_WITH(docdir,
   [[  --with-docdir=DIR       directory for SILC documentation [PREFIX/doc]]],
   [
     case "$withval" in
-      no)
+      no|yes)
         ;;
       *)
         DOCDIR="$withval"
@@ -346,7 +360,7 @@ AC_ARG_WITH(simdir,
   [[  --with-simdir=DIR       directory for SIM modules [PREFIX/modules]]],
   [
     case "$withval" in
-      no)
+      no|yes)
         ;;
       *)
         MODULESDIR="$withval"
@@ -363,7 +377,7 @@ AC_ARG_WITH(logsdir,
   [[  --with-logsdir=DIR      directory for SILC Server logs [PREFIX/logs]]],
   [
     case "$withval" in
-      no)
+      no|yes)
         ;;
       *)
         LOGSDIR="$withval"
@@ -373,12 +387,31 @@ AC_ARG_WITH(logsdir,
 AC_SUBST(LOGSDIR)
 AC_DEFINE_UNQUOTED(SILC_LOGSDIR, "$LOGSDIR")
 
+# Manual directory
+#
+MANDIR="$silc_prefix/man"
+AC_ARG_WITH(mandir,
+  [[  --with-mandir=DIR       directory for SILC manual pages [PREFIX/man]]],
+  [
+    case "$withval" in
+      no|yes)
+        ;;
+      *)
+        MANDIR="$withval"
+        ;;
+    esac
+  ])
+AC_SUBST(MANDIR)
+AC_DEFINE_UNQUOTED(SILC_MANDIR, "$MANDIR")
+
 # silcd config file checking
 #
+summary_silcd_configfile="/etc/silc/silcd.conf"
 AC_ARG_WITH(silcd-config-file,
   [[  --with-silcd-config-file=FILE  use FILE as default configuration file
                                  for SILC Server [/etc/silc/silcd.conf]]],
     AC_DEFINE_UNQUOTED(SILC_SERVER_CONFIG_FILE, "$withval")
+    summary_silcd_configfile="$withval"
   )
 
 # silcd pid file checking
@@ -394,7 +427,7 @@ AC_ARG_WITH(silcd-pid-file,
                                  Server [/var/run/silcd.pid]]],
   [
     case "$withval" in
-      no)
+      no|yes)
         ;;
       *)
         PIDFILE="$withval"
@@ -410,6 +443,9 @@ AC_SUBST(PIDFILE)
 
 # SOCKS4 support checking
 #
+SAVE_LIBS="$LIBS"
+SAVE_CFLAGS="$CFLAGS"
+SAVE_LDFLAGS="$LDFLAGS"
 AC_MSG_CHECKING(whether to support SOCKS4)
 AC_ARG_WITH(socks4,
   [[  --with-socks4[=DIR]     with SOCKS4 support [search in DIR/lib and DIR/include]]],
@@ -424,31 +460,34 @@ AC_ARG_WITH(socks4,
     
         if test -d "$withval/include"; then
           CFLAGS="$CFLAGS -I$withval/include"
-        else
-          CFLAGS="$CFLAGS -I$withval"
         fi
         if test -d "$withval/lib"; then
-          withval="-L$withval/lib -lsocks"
-        else
-          withval="-L$withval -lsocks"
+          LDFLAGS="$LDFLAGS -L$withval/lib"
         fi
     
-        LIBS="$withval $LIBS"
-        AC_TRY_LINK([],
-          [
-            Rconnect();
-          ], [],
-          [
-            AC_MSG_ERROR(Could not find SOCKS4 library.)
-          ])
+        LIBS="-lsocks $LIBS"
         ;;
     esac
+
+    AC_TRY_LINK([],
+      [
+        Rconnect();
+      ], [],
+      [
+        AC_MSG_ERROR(Could not find SOCKS4 library.)
+        LIBS="$SAVE_LIBS"
+        CFLAGS="$SAVE_CFLAGS"
+        LDFLAGS="$SAVE_LDFLAGS"
+      ])
   ],
     AC_MSG_RESULT(no)
   )
 
 # SOCKS5 support checking
 #
+SAVE_LIBS="$LIBS"
+SAVE_CFLAGS="$CFLAGS"
+SAVE_LDFLAGS="$LDFLAGS"
 AC_MSG_CHECKING(whether to support SOCKS5)
 AC_ARG_WITH(socks5,
   [[  --with-socks5[=DIR]     with SOCKS5 support [search in DIR/lib and DIR/include]]],
@@ -463,25 +502,25 @@ AC_ARG_WITH(socks5,
 
         if test -d "$withval/include"; then
           CFLAGS="$CFLAGS -I$withval/include"
-        else
-          CFLAGS="$CFLAGS -I$withval"
         fi
         if test -d "$withval/lib"; then
-          withval="-L$withval/lib -lsocks5"
-        else
-          withval="-L$withval -lsocks5"
+          LDFLAGS="$LDFLAGS -L$withval/lib"
         fi
 
-        LIBS="$withval $LIBS"
-        AC_TRY_LINK([],
-          [
-            SOCKSconnect();
-          ], [],
-          [
-            AC_MSG_ERROR(Could not find SOCKS5 library.)
-          ])
+        LIBS="-lsocks5 $LIBS"
         ;;
     esac
+
+    AC_TRY_LINK([],
+      [
+        SOCKSconnect();
+      ], [],
+      [
+        AC_MSG_ERROR(Could not find SOCKS5 library.)
+        LIBS="$SAVE_LIBS"
+        CFLAGS="$SAVE_CFLAGS"
+        LDFLAGS="$SAVE_LDFLAGS"
+      ])
   ],
     AC_MSG_RESULT(no)
   )
@@ -522,6 +561,9 @@ fi
 # source tree.
 #
 mp_gmp=false
+SAVE_LIBS="$LIBS"
+SAVE_CFLAGS="$CFLAGS"
+SAVE_LDFLAGS="$LDFLAGS"
 AC_MSG_CHECKING(whether to search for GMP)
 AC_ARG_WITH(gmp,
   [[  --with-gmp[=DIR]        use GMP instead of MPI [search in DIR/lib and DIR/include]]],
@@ -535,24 +577,26 @@ AC_ARG_WITH(gmp,
     
         if test -d "$withval/include"; then
           CFLAGS="$CFLAGS -I$withval/include"
-        else
-          CFLAGS="$CFLAGS -I$withval"
         fi
         if test -d "$withval/lib"; then
-          withval="-L$withval/lib -lgmp"
-        else
-          withval="-L$withval -lgmp"
+          LDFLAGS="$LDFLAGS -L$withval/lib"
         fi
     
-        LIBS="$withval $LIBS"
-        AC_CHECK_LIB(gmp, __gmpz_init,
-          [
-            mp_gmp=true
-            AC_DEFINE(SILC_MP_GMP)
-            AC_MSG_RESULT(Using GMP as a MP library.)
-          ])
+        LIBS="-lgmp $LIBS"
         ;;
     esac
+
+    AC_CHECK_LIB(gmp, __gmpz_init,
+      [
+        mp_gmp=true
+        AC_DEFINE(SILC_MP_GMP)
+        AC_MSG_RESULT(Using GMP as a MP library.)
+      ],
+      [
+        LIBS="$SAVE_LIBS"
+        CFLAGS="$SAVE_CFLAGS"
+        LDFLAGS="$SAVE_LDFLAGS"
+      ])
   ],
     AC_MSG_RESULT(no)
   )
@@ -568,6 +612,10 @@ fi
 #
 check_iconv=true
 has_iconv=false
+SAVE_LIBS="$LIBS"
+SAVE_CFLAGS="$CFLAGS"
+SAVE_LDFLAGS="$LDFLAGS"
+SAVE_CPPFLAGS="$CPPFLAGS"
 AC_MSG_CHECKING(whether to implicit search for libiconv)
 AC_ARG_WITH(iconv,
   [[  --with-iconv[=DIR]      use libiconv [search in DIR/include and DIR/lib]]],
@@ -624,26 +672,30 @@ if test x$check_iconv = xtrue; then
         [
           echo "yes"
           AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
-          has_iconv=true 
-          check_iconv=true 
+          has_iconv=true
+          check_iconv=false
+        ],
+        [
+          echo "no"
+          LIBS="$SAVE_LIBS"
+          CFLAGS="$SAVE_CFLAGS"
+          LDFLAGS="$SAVE_LDFLAGS"
+          CPPFLAGS="$SAVE_CPPFLAGS"
         ])
      ])
 fi
 
 if test x$check_iconv = xtrue; then
   # search for iconv library..
-  SAVE_CPPFLAGS="$CPPFLAGS"
+  SAVE_LIBS="$LIBS"
   SAVE_CFLAGS="$CFLAGS"
   SAVE_LDFLAGS="$LDFLAGS"
+  SAVE_CPPFLAGS="$CPPFLAGS"
     
   for dir in `echo "/usr/local /usr/pkg /usr/contrib"`; do
     if test x$has_iconv = xfalse; then
       AC_MSG_RESULT(searching in $dir...)
-    
-      CPPFLAGS="$SAVE_CPPFLAGS"
-      CFLAGS="$SAVE_CFLAGS"
-      LDFLAGS="$SAVE_LDFLAGS"
-      
+     
       if test -d $dir/include; then
         CPPFLAGS="$CPPFLAGS -I$dir/include"
         CFLAGS="$CFLAGS -I$dir/include"
@@ -675,8 +727,19 @@ if test x$check_iconv = xtrue; then
               AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
             ],
             [
+              echo "no"
               has_iconv=false
+              LIBS="$SAVE_LIBS"    
+              CFLAGS="$SAVE_CFLAGS"
+              LDFLAGS="$SAVE_LDFLAGS"
+              CPPFLAGS="$SAVE_CPPFLAGS"
             ])
+         ],
+         [
+           CFLAGS="$SAVE_CFLAGS"
+           LDFLAGS="$SAVE_LDFLAGS"
+           CPPFLAGS="$SAVE_CPPFLAGS"
          ])
       fi
     done
@@ -717,7 +780,7 @@ if test x$has_iconv = xtrue; then
     )
 
   if test x$ac_iconv_good = xno; then
-    AC_MSG_ERROR(Try using libiconv instead.)
+    AC_MSG_RESULT(Try using libiconv instead.)
   fi
 fi
 
@@ -747,10 +810,14 @@ AC_ARG_WITH(pthreads,
   ])
 
 if test x$check_threads = xtrue; then
+  SAVE_LIBS="$LIBS"
+  SAVE_CFLAGS="$CFLAGS"
+  SAVE_LDFLAGS="$LDFLAGS"
+  SAVE_CPPFLAGS="$CPPFLAGS"
+  
   AC_MSG_RESULT(yes)
   AC_CHECK_HEADERS(pthread.h,
     [
-      SAVE_LIBS="$LIBS"
       LIBS="$LIBS -lpthread"
       AC_CHECK_LIB(pthread, pthread_attr_init, has_threads=true,
         [
@@ -758,25 +825,20 @@ if test x$check_threads = xtrue; then
           case "${target}" in
             *-*-freebsd*)
               LIBS="$SAVE_LIBS -pthread"
-              AC_CHECK_LIB(c_r, pthread_attr_init, has_threads=true)
+              AC_CHECK_LIB(c_r, pthread_attr_init, has_threads=true, LIBS="$SAVE_LIBS")
+              ;;
+            *)
+              LIBS="$SAVE_LIBS"
               ;;
           esac
         ])
     ],
     [
       # search for pthread library..
-      SAVE_CPPFLAGS="$CPPFLAGS"
-      SAVE_CFLAGS="$CFLAGS"
-      SAVE_LDFLAGS="$LDFLAGS"
-
       for dir in `echo "/usr/local /usr/pkg /usr/contrib /usr/pkg/pthreads /usr/local/pthreads"`; do
         if test x$has_threads = xfalse; then
           AC_MSG_RESULT(searching in $dir...)
   
-          CPPFLAGS="$SAVE_CPPFLAGS"
-          CFLAGS="$SAVE_CFLAGS"
-          LDFLAGS="$SAVE_LDFLAGS"
-  
           if test -d $dir/include; then
             CPPFLAGS="$CPPFLAGS -I$dir/include"
             CFLAGS="$CFLAGS -I$dir/include"
@@ -792,7 +854,19 @@ if test x$check_threads = xtrue; then
             [ 
               LIBS="$LIBS -lpthread"
               AC_CHECK_LIB(pthread, pthread_attr_init, has_threads=true,
-                                                       has_threads=false)
+                [
+                  has_threads=false
+
+                  LIBS="$SAVE_LIBS"
+                  CFLAGS="$SAVE_CFLAGS"
+                  LDFLAGS="$SAVE_LDFLAGS"
+                  CPPFLAGS="$SAVE_CPPFLAGS"
+                ])
+            ],
+            [
+              CFLAGS="$SAVE_CFLAGS"
+              LDFLAGS="$SAVE_LDFLAGS"
+              CPPFLAGS="$SAVE_CPPFLAGS"
             ])
         fi
       done
@@ -907,7 +981,10 @@ if test x$without_irssi = xfalse; then
   fi
 fi
 
-AC_CONFIG_SUBDIRS(lib/silcmath/mpi)
+if test x$mp_gmp = xfalse; then
+  AC_CONFIG_SUBDIRS(lib/silcmath/mpi)
+fi
+
 #AC_CONFIG_SUBDIRS(lib/zlib)
 
 SILC_TOP_SRCDIR=`pwd`
@@ -945,6 +1022,7 @@ lib/silcutil/epoc/Makefile
 lib/silcsftp/Makefile
 lib/silcsftp/tests/Makefile
 doc/example_silcd.conf
+includes/silcincludes.h
 )
 
 if test "x$silc_dist" = "xsilc-client" ||
@@ -977,7 +1055,84 @@ silc/Makefile
 win32/Makefile
 win32/libsilc/Makefile
 win32/libsilcclient/Makefile
+tutorial/Makefile
+tutorial/Makefile.defines
+tutorial/Makefile.defines_int
 )
 fi
 
 AC_OUTPUT
+
+s_bindir=`eval echo $bindir`;s_bindir=`eval echo $s_bindir`
+s_sbindir=`eval echo $sbindir`;s_sbindir=`eval echo $s_sbindir`
+s_includedir=`eval echo $includedir`;s_includedir=`eval echo $s_includedir`
+
+echo ""
+echo "SILC Configuration Summary:"
+echo "---------------------------"
+echo " Target host ...................: $target"
+echo " Compiler ......................: $CC"
+echo " CFLAGS ........................: $CFLAGS"
+echo " CPPFLAGS ......................: $CPPFLAGS"
+echo " LDFLAGS .......................: $LDFLAGS"
+echo " LIBS ..........................: $LIBS"
+echo ""
+echo " Installation prefix ...........: $prefix"
+echo " bin directory .................: $s_bindir"
+echo " sbin directory ................: $s_sbindir"
+echo " man directory .................: $MANDIR"
+echo " help directory ................: $HELPDIR"
+echo " doc directory .................: $DOCDIR"
+echo " logs directory ................: $LOGSDIR"
+echo " SIM directory .................: $MODULESDIR"
+echo " include directory .............: $s_includedir"
+echo ""
+
+if test "x$silc_dist" = "xsilc-client" ||
+   test "x$silc_dist" = "xsilc-toolkit"; then
+  irssi="yes"
+  if test x$without_irssi = xtrue; then
+    irssi="no"
+  fi
+echo " Compile SILC Client ...........: $irssi"
+fi
+
+if test "x$silc_dist" = "xsilc-server" ||
+   test "x$silc_dist" = "xsilc-toolkit"; then
+  silcd="yes"
+  if test x$without_silcd = xtrue; then
+    without_silcd="no"
+  fi
+echo " Compile SILC Server ...........: $silcd"
+echo " Server configuration file .....: $summary_silcd_configfile"
+echo " Server PID file ...............: $PIDFILE"
+fi
+
+if test x$sim_support = xfalse; then
+  sim_support="no"
+else
+  sim_support="yes"
+fi
+echo " SIM support ...................: $sim_support"
+echo " IPv6 support ..................: $summary_ipv6"
+echo " Assembler optimizations .......: $summary_asm"
+
+mp="MPI"
+if test x$mp_gmp = xtrue; then
+  mp="GMP"
+fi
+echo " Arithmetic library ............: $mp"
+
+threads="no"
+if test x$has_threads = xtrue; then
+  threads="yes"
+fi
+echo " Multi-threads support .........: $threads"
+echo " Debugging enabled .............: $summary_debug"
+echo " Stack-trace enabled ...........: $summary_stacktrace"
+echo ""
+if test "x$silc_dist" = "xsilc-client"; then
+  echo "Compile the sources with 'make' or 'gmake' command (GNU make is required)."
+else
+  echo "Compile the sources with 'make' or 'gmake' command."
+fi