Added --without-irssi and without-silcd.
authorPekka Riikonen <priikone@silcnet.org>
Sat, 22 Jun 2002 09:42:39 +0000 (09:42 +0000)
committerPekka Riikonen <priikone@silcnet.org>
Sat, 22 Jun 2002 09:42:39 +0000 (09:42 +0000)
Makefile.am.pre
configure.in.pre
prepare

index 11ef6d0068bb5e2b9826d619e3d3658b5305c8a5..88bb10f77ee8dc8ec9e16129c0976e4ff95c173c 100644 (file)
@@ -3,7 +3,7 @@
 #
 #  Author: Pekka Riikonen <priikone@silcnet.org>
 #
-#  Copyright (C) 2000 - 200Pekka Riikonen
+#  Copyright (C) 2000 - 2002Pekka Riikonen
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
 AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
 
 COMMONDIRS = lib irssi silc silcd doc includes
-SUBDIRS = SILC_DISTRIBUTION_SUBDIRS
-DIST_SUBDIRS = SILC_DISTRIBUTION_SUBDIRS
+
+# Sub directories defined by "distributions" file, and can be overridden
+# with ./configure, which substitutes these variables.
+SUBDIRS = @SILC_DIST_SUBDIRS@
+DIST_SUBDIRS = @SILC_DIST_SUBDIRS@
 
 include $(top_srcdir)/Makefile.defines.in
 
index 3c670af88f26070ce4228b5744eecfbff227678c..34dad65186a4ce62d9608cc22204873a3da7ae60 100644 (file)
@@ -46,6 +46,7 @@ AC_SUBST(LN_S)
 # Distribution definition. ./prepare will automatically add here a correct
 # value. Do not edit!
 silc_dist=SILC_PACKAGE
+SILC_DIST_SUBDIRS="SILC_DISTRIBUTION_SUBDIRS"
 AC_DEFINE(SILC_DIST_DEFINE)
 
 # XXX
@@ -59,6 +60,7 @@ AC_PROG_INSTALL
 AC_PROG_RANLIB
 AC_PROG_MAKE_SET
 AC_PROG_LIBTOOL
+AC_PATH_PROG(sedpath, sed)
 
 # Header checking
 AC_HEADER_STDC
@@ -93,189 +95,8 @@ AC_DEFINE_UNQUOTED(SILC_SIZEOF_CHAR, $ac_cv_sizeof_char)
 AC_CHECK_SIZEOF(void *, 0)
 AC_DEFINE_UNQUOTED(SILC_SIZEOF_VOID_P, $ac_cv_sizeof_void_p)
 
-dnl Curses detection: Munged from Midnight Commander's configure.in
-AC_DEFUN(AC_CHECK_CURSES,[
-       search_ncurses=true
-       screen_manager=""
-       has_curses=false
-
-       CFLAGS=${CFLAGS--O}
-
-       AC_SUBST(CURSES_LIBS)
-       AC_SUBST(CURSES_INCLUDEDIR)
-
-       AC_ARG_WITH(sunos-curses,
-         [  --with-sunos-curses     Used to force SunOS 4.x curses],[
-         if test x$withval = xyes; then
-               AC_USE_SUNOS_CURSES
-         fi
-       ])
-
-       AC_ARG_WITH(osf1-curses,
-         [  --with-osf1-curses      Used to force OSF/1 curses],[
-         if test x$withval = xyes; then
-               AC_USE_OSF1_CURSES
-         fi
-       ])
-
-       AC_ARG_WITH(vcurses,
-         [  --with-vcurses[=incdir] Used to force SysV curses],
-         if test x$withval != xyes; then
-               CURSES_INCLUDEDIR="-I$withval"
-         fi
-         AC_USE_SYSV_CURSES
-       )
-
-       AC_ARG_WITH(ncurses,
-         [  --with-ncurses[=dir]    Compile with ncurses/locate base dir],
-         if test x$withval = xno ; then
-               search_ncurses=false
-         elif test x$withval != xyes ; then
-               AC_NCURSES($withval/include, ncurses.h, -L$withval/lib -lncurses, -I$withval/include, "ncurses on $withval/include")
-         fi
-       )
-
-       if $search_ncurses
-       then
-               AC_SEARCH_NCURSES()
-       fi
-])
-
-
-AC_DEFUN(AC_USE_SUNOS_CURSES, [
-       search_ncurses=false
-       screen_manager="SunOS 4.x /usr/5include curses"
-       AC_MSG_RESULT(Using SunOS 4.x /usr/5include curses)
-       AC_DEFINE(USE_SUNOS_CURSES)
-       AC_DEFINE(HAS_CURSES)
-       has_curses=true
-       AC_DEFINE(NO_COLOR_CURSES)
-       AC_DEFINE(USE_SYSV_CURSES)
-       CURSES_INCLUDEDIR="-I/usr/5include"
-       CURSES_LIBS="/usr/5lib/libcurses.a /usr/5lib/libtermcap.a"
-       AC_MSG_RESULT(Please note that some screen refreshs may fail)
-])
-
-AC_DEFUN(AC_USE_OSF1_CURSES, [
-       AC_MSG_RESULT(Using OSF1 curses)
-       search_ncurses=false
-       screen_manager="OSF1 curses"
-       AC_DEFINE(HAS_CURSES)
-       has_curses=true
-       AC_DEFINE(NO_COLOR_CURSES)
-       AC_DEFINE(USE_SYSV_CURSES)
-       CURSES_LIBS="-lcurses"
-])
-
-AC_DEFUN(AC_USE_SYSV_CURSES, [
-       AC_MSG_RESULT(Using SysV curses)
-       AC_DEFINE(HAS_CURSES)
-       has_curses=true
-       AC_DEFINE(USE_SYSV_CURSES)
-       search_ncurses=false
-       screen_manager="SysV/curses"
-       CURSES_LIBS="-lcurses"
-])
-
-dnl
-dnl Parameters: directory filename cureses_LIBS curses_INCLUDEDIR nicename
-dnl
-AC_DEFUN(AC_NCURSES, [
-    if $search_ncurses
-    then
-        if test -f $1/$2
-       then
-           AC_MSG_RESULT(Found ncurses on $1/$2)
-
-           CURSES_LIBS="$3"
-           AC_CHECK_LIB(ncurses, initscr, , [
-                CHECKLIBS=`echo "$3"|sed 's/-lncurses/-lcurses/g'`
-               AC_CHECK_LIB(curses, initscr, [
-                       CURSES_LIBS="$CHECKLIBS"
-               ],, $CHECKLIBS)
-           ], $CURSES_LIBS)
-           CURSES_INCLUDEDIR="$4"
-           search_ncurses=false
-           screen_manager=$5
-            AC_DEFINE(HAS_CURSES)
-            has_curses=true
-           has_ncurses=true
-           AC_DEFINE(USE_NCURSES)
-       fi
-    fi
-])
-
-AC_DEFUN(AC_SEARCH_NCURSES, [
-    AC_CHECKING("location of ncurses.h file")
-
-    AC_NCURSES(/usr/include, ncurses.h, -lncurses,, "ncurses on /usr/include")
-    AC_NCURSES(/usr/include/ncurses, ncurses.h, -lncurses, -I/usr/include/ncurses, "ncurses on /usr/include/ncurses")
-    AC_NCURSES(/usr/local/include, ncurses.h, -L/usr/local/lib -lncurses, -I/usr/local/include, "ncurses on /usr/local")
-    AC_NCURSES(/usr/pkg/include, ncurses.h, -L/usr/pkg/lib -lncurses, -I/usr/pkg/include, "ncurses on /usr/pkg")
-    AC_NCURSES(/usr/contrib/include, ncurses.h, -L/usr/contrib/lib -lncurses, -I/usr/contrib/include, "ncurses on /usr/contrib")
-    AC_NCURSES(/usr/local/include/ncurses, ncurses.h, -L/usr/local/lib -L/usr/local/lib/ncurses -lncurses, -I/usr/local/include/ncurses, "ncurses on /usr/local/include/ncurses")
-
-    AC_NCURSES(/usr/local/include/ncurses, curses.h, -L/usr/local/lib -lncurses, -I/usr/local/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on /usr/local/.../ncurses")
-
-    AC_NCURSES(/usr/include/ncurses, curses.h, -lncurses, -I/usr/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on /usr/include/ncurses")
-
-    dnl
-    dnl We couldn't find ncurses, try SysV curses
-    dnl
-    if $search_ncurses 
-    then
-        AC_EGREP_HEADER(init_color, /usr/include/curses.h,
-           AC_USE_SYSV_CURSES)
-       AC_EGREP_CPP(USE_NCURSES,[
-#include <curses.h>
-#ifdef __NCURSES_H
-#undef USE_NCURSES
-USE_NCURSES
-#endif
-],[
-       CURSES_INCLUDEDIR="$CURSES_INCLUDEDIR -DRENAMED_NCURSES"
-        AC_DEFINE(HAS_CURSES)
-       has_curses=true
-       has_ncurses=true
-        AC_DEFINE(USE_NCURSES)
-        search_ncurses=false
-        screen_manager="ncurses installed as curses"
-])
-    fi
-
-    dnl
-    dnl Try SunOS 4.x /usr/5{lib,include} ncurses
-    dnl The flags USE_SUNOS_CURSES, USE_BSD_CURSES and BUGGY_CURSES
-    dnl should be replaced by a more fine grained selection routine
-    dnl
-    if $search_ncurses
-    then
-       if test -f /usr/5include/curses.h
-       then
-           AC_USE_SUNOS_CURSES
-        fi
-    fi
-
-    dnl use whatever curses there happens to be
-    if $search_ncurses
-    then
-       if test -f /usr/include/curses.h
-       then
-         CURSES_LIBS="-lcurses"
-         AC_DEFINE(HAS_CURSES)
-         has_curses=true
-         search_ncurses=false
-         screen_manager="curses"
-       fi
-    fi
-])
-
-AC_CHECK_CURSES
-LIBS="$LIBS $CURSES_LIBS"
-
 # Function and library checking
-AC_CHECK_FUNC(gethostbyname, ac_gethostbyname_found=1,
-ac_gethostbyname_found=0)
+AC_CHECK_FUNC(gethostbyname, ac_gethostbyname_found=1,ac_gethostbyname_found=0)
 if test x$ac_gethostbyname_found = x0; then
     AC_CHECK_LIB(nsl, gethostbyname, LIBS="$LIBS -lnsl")
     AC_CHECK_FUNC(res_gethostbyname, ac_res_ghbn_found=1, ac_res_ghbn_found=0)
@@ -292,7 +113,8 @@ AC_CHECK_FUNCS(select listen bind shutdown close connect)
 AC_CHECK_FUNCS(fcntl setsockopt)
 AC_CHECK_FUNCS(getopt_long time)
 AC_CHECK_FUNCS(chmod stat fstat getenv putenv strerror ctime gettimeofday)
-AC_CHECK_FUNCS(getpid getgid getsid getpgid getpgrp getuid setgroups initgroups)
+AC_CHECK_FUNCS(getpid getgid getsid getpgid getpgrp getuid)
+AC_CHECK_FUNCS(setgroups initgroups)
 AC_CHECK_FUNCS(strchr strstr strcpy strncpy memcpy memset memmove utime iconv)
 AC_CHECK_FUNCS(pthread_create nl_langinfo)
 
@@ -326,14 +148,13 @@ else
 fi
 
 # etc directory
-#ETCDIR="/etc/silc"
 if test "x$sysconfdir" != 'x${prefix}/etc'; then
        ETCDIR="$sysconfdir"
 else
        ETCDIR="$silc_prefix/etc"
 fi
 AC_ARG_WITH(etcdir,
-[  --with-etcdir[=PATH]    Directory for system files [/etc/silc]],
+[  --with-etcdir[=PATH]      Directory for system files [/etc/silc]],
 [ case "$withval" in
   no)
     ;;
@@ -349,10 +170,9 @@ AC_SUBST(ETCDIR)
 AC_DEFINE_UNQUOTED(SILC_ETCDIR, "$ETCDIR")
 
 # help directory
-#HELPDIR="help"
 HELPDIR="$silc_prefix/help"
 AC_ARG_WITH(helpdir,
-[  --with-helpdir[=PATH]   Directory for SILC help files [PREFIX/help]],
+[  --with-helpdir[=PATH]     Directory for SILC help files [PREFIX/help]],
 [ case "$withval" in
   no)
     ;;
@@ -368,10 +188,9 @@ AC_SUBST(HELPDIR)
 AC_DEFINE_UNQUOTED(SILC_HELPDIR, "$HELPDIR")
 
 # doc directory
-#DOCDIR="doc"
 DOCDIR="$silc_prefix/doc"
 AC_ARG_WITH(docdir,
-[  --with-docdir[=PATH]    Directory for SILC documentation [PREFIX/doc]],
+[  --with-docdir[=PATH]      Directory for SILC documentation [PREFIX/doc]],
 [ case "$withval" in
   no)
     ;;
@@ -387,10 +206,9 @@ AC_SUBST(DOCDIR)
 AC_DEFINE_UNQUOTED(SILC_DOCDIR, "$DOCDIR")
 
 # SIM modules directory
-#MODULESDIR="modules"
 MODULESDIR="$silc_prefix/modules"
 AC_ARG_WITH(simdir,
-[  --with-simdir[=PATH]    Directory for SIM modules [PREFIX/modules]],
+[  --with-simdir[=PATH]      Directory for SIM modules [PREFIX/modules]],
 [ case "$withval" in
   no)
     ;;
@@ -406,10 +224,9 @@ AC_SUBST(MODULESDIR)
 AC_DEFINE_UNQUOTED(SILC_MODULESDIR, "$MODULESDIR")
 
 # Logs directory
-#LOGSDIR="logs"
 LOGSDIR="$silc_prefix/logs"
 AC_ARG_WITH(logsdir,
-[  --with-logsdir[=PATH]   Directory for Server logs [PREFIX/logs]],
+[  --with-logsdir[=PATH]     Directory for Server logs [PREFIX/logs]],
 [ case "$withval" in
   no)
     ;;
@@ -427,7 +244,7 @@ AC_DEFINE_UNQUOTED(SILC_LOGSDIR, "$LOGSDIR")
 # SOCKS4 support checking
 AC_MSG_CHECKING(whether to support SOCKS4)
 AC_ARG_WITH(socks4,
-[  --with-socks4[=PATH]    Compile with SOCKS4 support],
+[  --with-socks4[=PATH]      Compile with SOCKS4 support],
 [ case "$withval" in
   no)
     AC_MSG_RESULT(no)
@@ -461,7 +278,7 @@ AC_ARG_WITH(socks4,
 # SOCKS5 support checking
 AC_MSG_CHECKING(whether to support SOCKS5)
 AC_ARG_WITH(socks5,
-[  --with-socks5[=PATH]    Compile with SOCKS5 support],
+[  --with-socks5[=PATH]      Compile with SOCKS5 support],
 [ case "$withval" in
   no)
     AC_MSG_RESULT(no)
@@ -530,7 +347,7 @@ fi
 #
 AC_MSG_CHECKING(whether to support GMP)
 AC_ARG_WITH(gmp,
-[  --with-gmp[=PATH]       Compile with GMP support instead of MPI],
+[  --with-gmp[=PATH]         Compile with GMP support instead of MPI],
 [ case "$withval" in
   no)
     AC_MSG_RESULT(no)
@@ -625,6 +442,26 @@ AM_CONDITIONAL(SILC_BEOS, test xfalse = xtrue)
 #
 AM_CONDITIONAL(SILC_OS2, test xfalse = xtrue)
 
+#
+# --without-irssi
+#
+without_irssi=false
+AC_ARG_WITH(irssi,
+[  --without-irssi         Compile without Irssi SILC Client],
+[ without_irssi=true 
+  SILC_DIST_SUBDIRS=`echo $SILC_DIST_SUBDIRS | $sedpath -e 's/irssi//'`
+])
+
+#
+# --without-silcd
+#
+without_silcd=false
+AC_ARG_WITH(silcd,
+[  --without-silcd         Compile without SILC Server],
+[ without_silcd=true
+  SILC_DIST_SUBDIRS=`echo $SILC_DIST_SUBDIRS | $sedpath -e 's/silcd//'`
+])
+
 #
 # IPv6 support
 #
@@ -682,7 +519,7 @@ esac ], CFLAGS="-O2 -g $CFLAGS"
         AC_MSG_RESULT(no))
 
 AC_MSG_CHECKING(for enabled stack tracing)
-AC_ARG_ENABLE(debug,
+AC_ARG_ENABLE(stack-trace,
 [  --enable-stack-trace    Enable memory stack trace],
 [ case "${enableval}" in
   yes) 
@@ -783,10 +620,13 @@ fi
 #
 # Other configure scripts
 #
-if test "x$silc_dist" = "xsilc-client" || 
-   test "x$silc_dist" = "xsilc-toolkit"; then
-AC_CONFIG_SUBDIRS(irssi)
+if test x$without_irssi = xfalse; then
+  if test "x$silc_dist" = "xsilc-client" || 
+     test "x$silc_dist" = "xsilc-toolkit"; then
+  AC_CONFIG_SUBDIRS(irssi)
+  fi
 fi
+
 AC_CONFIG_SUBDIRS(lib/silcmath/mpi)
 #AC_CONFIG_SUBDIRS(lib/zlib)
 
@@ -797,6 +637,7 @@ AC_SUBST(SILC_TOP_SRCDIR)
 AC_SUBST(LIBS)
 INCLUDE_DEFINES_INT="include \$(top_srcdir)/Makefile.defines_int"
 AC_SUBST(INCLUDE_DEFINES_INT)
+AC_SUBST(SILC_DIST_SUBDIRS)
 
 #
 # Makefile outputs
@@ -827,21 +668,29 @@ lib/silcsftp/tests/Makefile
 doc/example_silcd.conf
 )
 
+if test "x$silc_dist" = "xsilc-client" || 
+   test "x$silc_dist" = "xsilc-toolkit"; then
+AC_CONFIG_FILES(lib/silcclient/Makefile)
+fi
+
+if test x$without_irssi = xfalse ; then
 if test "x$silc_dist" = "xsilc-client" || 
    test "x$silc_dist" = "xsilc-toolkit"; then
 AC_CONFIG_FILES( \
-lib/silcclient/Makefile
 irssi/Makefile.defines
 irssi/Makefile.defines_int
 )
 fi
+fi
 
+if test x$without_silcd = xfalse ; then
 if test "x$silc_dist" = "xsilc-server" ||
    test "x$silc_dist" = "xsilc-toolkit"; then
 AC_CONFIG_FILES( \
 silcd/Makefile
 )
 fi
+fi
 
 if test "x$silc_dist" = "xsilc-toolkit"; then
 AC_CONFIG_FILES( \
diff --git a/prepare b/prepare
index 0ac00c370b1482e5f68d156ee7bfc9f1bd0f142d..9e224e8b044b9971be5c34718373d53128479877 100755 (executable)
--- a/prepare
+++ b/prepare
@@ -66,7 +66,7 @@ echo "Preparing $distribution distribution version $version (package $dist_versi
 #
 subdirs=`grep "$distribution"_SUBDIRS= distributions |cut -d=  -f2`
 ed=`grep "$distribution"_EXTRA_DIST= distributions |cut -d=  -f2`
-sed -e "/SILC_DISTRIBUTION_SUBDIRS/s//$subdirs/" -e "/SILC_DISTRIBUTION_EXTRA/s,,$ed," Makefile.am.pre >Makefile.am
+sed -e "/SILC_DISTRIBUTION_EXTRA/s,,$ed," Makefile.am.pre >Makefile.am
 path=`pwd`
 for i in $subdirs
 do
@@ -89,7 +89,7 @@ cd $path
 # the actual configure.in
 #
 echo "# Automatically generated by ./prepare from configure.in.pre. Do not edit!" >configure.in2
-sed -e "/SILC_VERSION/s//$dist_version/" -e "/SILC_PACKAGE/s//silc-"$distribution"/" configure.in.pre >>configure.in2
+sed -e "/SILC_DISTRIBUTION_SUBDIRS/s//$subdirs/" -e "/SILC_VERSION/s//$dist_version/" -e "/SILC_PACKAGE/s//silc-"$distribution"/" configure.in.pre >>configure.in2
 
 #
 # Create also the acconfig.h for the distribution. Note that this sets