Manual pages installation fix patch by Ville Räsänen.

[silc.git] / configure.in.pre

diff --git a/configure.in.pre b/configure.in.pre
index 86305afeb96700d5290e8448ba6f1c6e49536527..2766a7ce4c8821acfba9b38969045fa41070f30f 100644 (file)
--- a/configure.in.pre
+++ b/configure.in.pre
@@ -92,17 +92,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 +176,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 +192,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 +205,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 +216,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 +225,7 @@ fi
 # Debug checking
 #
 AC_MSG_CHECKING(whether to enable debugging)
+summary_debug="no"
 AC_ARG_ENABLE(debug,
   [  --enable-debug          enable debugging],
   [
@@ -226,6 +234,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 +250,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 +258,7 @@ AC_ARG_ENABLE(stack-trace,
     yes)
       AC_MSG_RESULT(yes)
       AC_DEFINE(SILC_STACKTRACE)
+      summary_stacktrace="yes"
       ;;
     *)
       AC_MSG_RESULT(no)
@@ -260,6 +271,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 +279,7 @@ AC_ARG_ENABLE(asm,
   ],
   [
     AC_MSG_RESULT(yes)
+    summary_asm="yes"
   ])
 
 
@@ -373,12 +386,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)
+        ;;
+      *)
+        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
@@ -624,8 +656,11 @@ 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"
         ])
      ])
 fi
@@ -675,6 +710,7 @@ if test x$check_iconv = xtrue; then
               AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
             ],
             [
+              echo "no"
               has_iconv=false
             ])
          ])
@@ -717,7 +753,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
 
@@ -907,7 +943,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 +984,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 +1017,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 " Assmebler 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