Merged silc_1_0_branch to trunk.

diff --git a/Makefile.ad b/Makefile.ad
index e76466de5db6f39a2c5ff02e91e4aed6968bc34e..e2a6a2c67c28bd21b9c2c06fb6495e0402dcf58c 100644 (file)
--- a/Makefile.ad
+++ b/Makefile.ad
@@ -18,20 +18,13 @@
 AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
 
 SUBDIRS =              \
+#ifdef SILC_DIST_LIB
+       @LIBSUBDIR@     \
+#endif SILC_DIST_LIB
 #ifdef SILC_DIST_APPS
        apps            \
 #endif SILC_DIST_APPS
-#ifdef SILC_DIST_LIB
-       lib             \
-#endif SILC_DIST_LIB
-#ifdef SILC_DIST_CLIENT
-       irssi           \
-#endif SILC_DIST_CLIENT
-#ifdef SILC_DIST_SERVER
-       silcd           \
-#endif SILC_DIST_SERVER
 #ifdef SILC_DIST_TOOLKIT
-       silc            \
        win32           \
 #endif SILC_DIST_TOOLKIT
 #ifdef SILC_DIST_INCLUDES
@@ -44,122 +37,38 @@ SUBDIRS =          \
 EXTRA_DIST =           \
        silcdefs.h.in   \
 #ifdef SILC_DIST_SILC
-#ifdef SILC_DIST_TOOLKIT
-       README.CVS README.WIN32 README.MACOSX silcer tutorial \
-#endif SILC_DIST_TOOLKIT
        libtoolfix      \
        CHANGES CREDITS
 #endif SILC_DIST_SILC
 
-#ifdef SILC_DIST_SILC
-#
-# Installing of SILC into the system
-#
-
-install-dirs:
-       -mkdir -p $(etcdir)
-       -mkdir -p $(modulesdir)
-       -mkdir -p $(docdir)
-
-doc-install:
-       -$(INSTALL_DATA) $(srcdir)/doc/CodingStyle $(docdir)/
-       -$(INSTALL_DATA) $(srcdir)/doc/FAQ $(docdir)/
-       -$(INSTALL_DATA) $(srcdir)/doc/*.txt $(docdir)/
-       -$(INSTALL_DATA) $(srcdir)/COPYING $(docdir)/
-       -$(INSTALL_DATA) $(srcdir)/CHANGES $(docdir)/
-       -$(INSTALL_DATA) $(srcdir)/CREDITS $(docdir)/
-       -$(INSTALL_DATA) $(srcdir)/README* $(docdir)/
-       -$(INSTALL_DATA) $(srcdir)/INSTALL $(docdir)/
-       -$(INSTALL_DATA) $(srcdir)/TODO $(docdir)/
-
-#ifdef SILC_DIST_SIM
-sim-install:
-       -$(INSTALL_DATA) $(srcdir)/lib/silcsim/*.so $(modulesdir)/
-#endif SILC_DIST_SIM
-
 #ifdef SILC_DIST_CLIENT
-install-dirs-client: install-dirs
+if with_irssi
+install-dirs-client:
+       -mkdir -p $(etcdir)
        -mkdir -p $(helpdir)
        -mkdir -p $(mandir)/man1
 
-doc-install-client: doc-install
-       $(INSTALL_DATA) $(srcdir)/irssi/silc.conf $(docdir)/example_silc.conf
+doc-install-client:
+       $(INSTALL_DATA) $(srcdir)/apps/irssi/silc.conf $(docdir)/example_silc.conf
        -@if test -f $(srcdir)/doc/silc.1 ; then \
         $(INSTALL_DATA) $(srcdir)/doc/silc.1 $(mandir)/man1; \
        fi
 
 etc-install-client:
-       -@if test '!' -d $(srcdir)/irssi ; then \
+       -@if test '!' -d $(srcdir)/apps/irssi ; then \
          if test '!' -f $(etcdir)/silc.conf ; then \
-           $(INSTALL_DATA) $(srcdir)/irssi/silc.conf \
+           $(INSTALL_DATA) $(srcdir)/apps/irssi/silc.conf \
                $(etcdir)/silc.conf; \
          fi; \
        fi
-#endif SILC_DIST_CLIENT
-
-#ifdef SILC_DIST_SERVER
-install-dirs-server: install-dirs
-       -mkdir -p $(logsdir)
-       -mkdir -p $(mandir)/man5
-       -mkdir -p $(mandir)/man8
-
-doc-install-server: doc-install
-       -$(INSTALL_DATA) $(srcdir)/doc/example_silcd.conf $(docdir)/
-       -@if test -f $(srcdir)/doc/silcd.8 ; then \
-        $(INSTALL_DATA) $(srcdir)/doc/silcd.8 $(mandir)/man8; \
-       fi
-       -@if test -f $(srcdir)/doc/silcd.conf.5 ; then \
-        $(INSTALL_DATA) $(srcdir)/doc/silcd.conf.5 $(mandir)/man5; \
-       fi
-
-etc-install-server:
-       -@if test '!' -f $(etcdir)/silcd.conf ; then \
-         $(INSTALL_DATA) $(srcdir)/doc/example_silcd.conf \
-               $(etcdir)/silcd.conf; \
-         $(INSTALL_DATA) $(srcdir)/doc/silcalgs.conf \
-               $(etcdir)/silcalgs.conf; \
-          chmod go= $(etcdir)/silcd.conf; \
-       fi
-
-examples-install:
-       -mkdir -p $(docdir)/examples/
-       -$(INSTALL_DATA) $(srcdir)/doc/examples/README $(docdir)/examples/
-       -$(INSTALL_DATA) $(srcdir)/doc/examples/silc* $(docdir)/examples/
-
-generate-server-key:
-       -@if test '!' -f $(etcdir)/silcd.pub ; then \
-         $(sbindir)/silcd -C $(etcdir); \
-       fi
-#endif SILC_DIST_SERVER
-
-#ifdef SILC_DIST_TOOLKIT
-toolkit-install:
-       -mkdir -p $(docdir)/toolkit/
-       -$(INSTALL_DATA) $(srcdir)/doc/toolkit/* $(docdir)/toolkit
-       -$(INSTALL_DATA) $(srcdir)/lib/doc/*.gif $(docdir)/toolkit
-       -cp -R $(srcdir)/tutorial $(docdir)
-#endif SILC_DIST_TOOLKIT
 
 install-data-hook:             \
-#ifdef SILC_DIST_CLIENT
        install-dirs-client     \
        doc-install-client      \
-       etc-install-client      \
+       etc-install-client
+endif
 #endif SILC_DIST_CLIENT
-#ifdef SILC_DIST_SERVER
-       install-dirs-server     \
-       doc-install-server      \
-       etc-install-server      \
-       examples-install        \
-       generate-server-key     \
-#endif SILC_DIST_SERVER
-#ifdef SILC_DIST_TOOLKIT
-       toolkit-install         \
-#endif SILC_DIST_TOOLKIT
-#ifdef SILC_DIST_SIM
-       sim-install
-#endif SILC_DIST_SIM
 
+#ifdef SILC_DIST_SILC
 include $(top_srcdir)/Makefile.defines.in
-
 #endif SILC_DIST_SILC

diff --git a/configure.ad b/configure.ad
index b63cacbf1617b902ba29fd8cf19da6314ab96d94..0182a49af1304f2720cc67d2b01b31732463cb96 100644 (file)
--- a/configure.ad
+++ b/configure.ad
@@ -56,7 +56,9 @@ __SILC_HAVE_SIM=""
 __SILC_ENABLE_DEBUG=""
 
 AC_PROG_RANLIB
+#ifndef SILC_DIST_TOOLKIT
 AC_DISABLE_SHARED
+#endif SILC_DIST_TOOLKIT
 AC_PROG_LIBTOOL
 
 # Header checking
@@ -153,7 +155,7 @@ fi
 #
 AC_CHECK_HEADER(regex.h,
   [
-    AC_DEFINE([HAVE_REGEX], [], [HAVE_REGEX])
+    AC_DEFINE([HAVE_REGEX_H], [], [HAVE_REGEX_H])
     have_regex=1
   ], have_regex=0
 )
@@ -997,6 +999,7 @@ AC_ARG_WITH(irssi,
     AC_MSG_RESULT(no)
     without_irssi=true
   ])
+AM_CONDITIONAL(with_irssi, test xwithout_irssi = xfalse)
 
 # --with-silcd
 #
@@ -1013,6 +1016,10 @@ AC_ARG_WITH(silcd,
     without_silcd=true
   ])
 #endif SILC_DIST_TOOLKIT
+#ifdef SILC_DIST_INPLACE
+without_irssi=false
+without_silcd=false
+#endif SILC_DIST_INPLACE
 
 libtoolfix=true
 AC_MSG_CHECKING(whether to do libtoolfix)
@@ -1122,12 +1129,6 @@ echo " sbin directory ................: $s_sbindir"
 echo " etc directory .................: $ETCDIR"
 echo " man directory .................: $s_mandir"
 echo " doc directory .................: $DOCDIR"
-#ifdef SILC_DIST_CLIENT
-echo " help directory ................: $HELPDIR"
-#endif SILC_DIST_CLIENT
-#ifdef SILC_DIST_SERVER
-echo " logs directory ................: $LOGSDIR"
-#endif SILC_DIST_SERVER
 #ifdef SILC_DIST_SIM
 echo " SIM directory .................: $MODULESDIR"
 #endif SILC_DIST_SIM
@@ -1151,10 +1152,6 @@ echo " Compile SILC Client ...........: $irssi"
 
 #ifdef SILC_DIST_SERVER
 echo " Compile SILC Server ...........: $silcd"
-if test x$without_silcd = xfalse; then
-echo " Server configuration file .....: $summary_silcd_configfile"
-echo " Server PID file ...............: $PIDFILE"
-fi
 #endif SILC_DIST_SERVER
 
 #ifdef SILC_DIST_SIM

diff --git a/distdir/default b/distdir/default
index a000fd977bb06380a16f3a78843f976f8b25cfd1..9c3a9060884bb9a6417e5c83191872d5faefb3ba 100644 (file)
--- a/distdir/default
+++ b/distdir/default
@@ -12,5 +12,10 @@ inherit common
 inherit client
 inherit server
 inherit toolkit
+
 define SILC_DIST_INPLACE
+
+# SFTP is undefined in server, so force it here
+define SILC_DIST_SFTP
+
 pre-hook distdir/pre-run