updates.

[silc.git] / configure.ad

diff --git a/configure.ad b/configure.ad
index f2b140d394d63b018b88efb45448fd0b0ca108f5..d634a90038100cae8c9646a242a5f55aee39f178 100644 (file)
--- a/configure.ad
+++ b/configure.ad
@@ -114,6 +114,7 @@ AC_CHECK_FUNCS(getpid getgid getsid getpgid getpgrp getuid)
 AC_CHECK_FUNCS(setgroups initgroups nl_langinfo)
 AC_CHECK_FUNCS(strchr strstr strcpy strncpy memcpy memset memmove)
 
+#ifdef SILC_DIST_SIM
 # SIM support checking
 # XXX These needs to be changed as more supported platforms appear.
 # XXX This probably needs to be made platform dependant check.
@@ -145,6 +146,7 @@ if test x$sim_support = xtrue; then
 else
   AC_MSG_RESULT(No SIM support found.)
 fi
+#endif SILC_DIST_SIM
 
 # lib/contrib conditionals
 #
@@ -168,6 +170,7 @@ AM_CONDITIONAL(HAVE_GETOPT_LONG, test x$have_getopt_long = x1)
 ##  Enable/disable checking
 ##
 
+#ifdef SILC_DIST_IPV6
 # IPv6 support
 #
 AC_MSG_CHECKING(whether to enable IPv6 support)
@@ -223,6 +226,7 @@ if test x$check_ipv6 = xtrue; then
       AC_MSG_RESULT(no)
     )
 fi
+#endif SILC_DIST_IPV6
 
 # Debug checking
 #
@@ -248,6 +252,7 @@ AC_ARG_ENABLE(debug,
     AC_MSG_RESULT(no)
   ])
 
+#ifdef SILC_DIST_ASM
 # Disable all assembler optimizations
 #
 AC_MSG_CHECKING(whether to enable assembler optimizations)
@@ -262,7 +267,7 @@ AC_ARG_ENABLE(asm,
     AC_MSG_RESULT(yes)
     want_asm=true
   ])
-
+#endif SILC_DIST_ASM
 
 ##
 ## Compiler and compiler flag checks
@@ -399,6 +404,7 @@ AC_ARG_WITH(docdir,
 AC_SUBST(DOCDIR)
 AC_DEFINE_UNQUOTED([SILC_DOCDIR], "$DOCDIR", [SILC_DOCDIR])
 
+#ifdef SILC_DIST_SIM
 # SIM modules directory
 #
 MODULESDIR="$silc_prefix/modules"
@@ -415,6 +421,7 @@ AC_ARG_WITH(simdir,
   ])
 AC_SUBST(MODULESDIR)
 AC_DEFINE_UNQUOTED([SILC_MODULESDIR], "$MODULESDIR", [SILC_MODULESDIR])
+#endif SILC_DIST_SIM
 
 #ifdef SILC_DIST_SERVER
 
@@ -619,6 +626,7 @@ if test "x$socks" = "x5"; then
   AC_DEFINE([Rgethostbyname], [SOCKSgethostbyname], [Socks])
 fi
 
+#ifdef SILC_DIST_MATH
 # MP library checking. First check whether user wants to use GMP and use
 # it if found. If not or not defined then compile the MPI library in the
 # source tree.
@@ -670,7 +678,7 @@ if test x$mp_gmp = xfalse; then
   AC_DEFINE([SILC_MP_NSS_MPI], [], [MPI])
   AC_MSG_RESULT(Using NSS MPI as a MP library.)
 fi
-
+#endif SILC_DIST_MATH
 
 # iconv support
 #
@@ -853,6 +861,7 @@ if test x$has_iconv = xtrue; then
 fi
 
 
+#ifdef SILC_DIST_THREAD
 # POSIX threads support
 #
 has_threads=false
@@ -978,6 +987,8 @@ if test x$has_threads = xtrue; then
   AC_DEFINE([SILC_THREADS], [], [HAVE_THREAD])
   __SILC_HAVE_PTHREAD="#define __SILC_HAVE_PTHREAD 1"
 fi
+#endif SILC_DIST_THREAD
+
 
 # Native WIN32 compilation under cygwin
 #
@@ -1117,8 +1128,8 @@ Makefile
 Makefile.defines
 Makefile.defines_int
 doc/Makefile
-includes/Makefile
 doc/example_silcd.conf
+includes/Makefile
 includes/silcversion.h
 includes/silcincludes.h
 )
@@ -1166,7 +1177,7 @@ s_mandir=`eval echo $mandir`;s_mandir=`eval echo $s_mandir`
 s_includedir=`eval echo $includedir`;s_includedir=`eval echo $s_includedir`
 
 echo ""
-echo "SILC Configuration Summary:"
+echo "$PACKAGE Configuration Summary:"
 echo "---------------------------"
 echo " Target host ...................: $target"
 echo " Compiler ......................: $CC"
@@ -1182,9 +1193,15 @@ echo " etc directory .................: $ETCDIR"
 echo " man directory .................: $s_mandir"
 echo " help directory ................: $HELPDIR"
 echo " doc directory .................: $DOCDIR"
+#ifdef SILC_DIST_SERVER
 echo " logs directory ................: $LOGSDIR"
+#endif SILC_DIST_SERVER
+#ifdef SILC_DIST_SIM
 echo " SIM directory .................: $MODULESDIR"
+#endif SILC_DIST_SIM
+#ifdef SILC_DIST_INCLUDES
 echo " include directory .............: $s_includedir"
+#endif SILC_DIST_INCLUDES
 echo ""
 
 #ifdef SILC_DIST_SERVER
@@ -1210,37 +1227,50 @@ echo " Server configuration file .....: $summary_silcd_configfile"
 echo " Server PID file ...............: $PIDFILE"
 #endif SILC_DIST_SERVER
 
+#ifdef SILC_DIST_SIM
 if test x$sim_support = xfalse; then
   sim_support="no"
 else
   sim_support="yes"
 fi
+echo " SIM support ...................: $sim_support"
+#endif SILC_DIST_SIM
+
+#ifdef SILC_DIST_IPV6
+echo " IPv6 support ..................: $summary_ipv6"
+#endif SILC_DIST_IPV6
+
 if test x$has_iconv = xfalse; then
   iconv_support="no"
 else
   iconv_support="yes"
 fi
-echo " SIM support ...................: $sim_support"
-echo " IPv6 support ..................: $summary_ipv6"
 echo " Iconv support .................: $iconv_support"
+
+#ifdef SILC_DIST_ASM
 if test x$want_asm = xfalse; then
   summary_asm="no"
 else
   summary_asm="yes"
 fi
 echo " Assembler optimizations .......: $summary_asm"
+#endif SILC_DIST_ASM
 
+#ifdef SILC_DIST_MATH
 mp="MPI"
 if test x$mp_gmp = xtrue; then
   mp="GMP"
 fi
 echo " Arithmetic library ............: $mp"
+#endif SILC_DIST_MATH
 
+#ifdef SILC_DIST_THREAD
 threads="no"
 if test x$has_threads = xtrue; then
   threads="yes"
 fi
 echo " Multi-threads support .........: $threads"
+#endif SILC_DIST_THREAD
 echo " Debugging enabled .............: $summary_debug"
 echo ""
 echo "Compile the sources with 'make' or 'gmake' command."