updates.

diff --git a/apps/Makefile.ad b/apps/Makefile.ad
index 52ad02066ce0ceb76fc012159f4d9aa6f339f30a..9d24796a6f71ad750e01d15cac8fd1d94e9f433a 100644 (file)
--- a/apps/Makefile.ad
+++ b/apps/Makefile.ad
@@ -22,9 +22,9 @@ SUBDIRS =     \
        autodist \
 #endif SILC_DIST_AUTODIST
 #ifdef SILC_DIST_SERVER
-       silcd \
+       @SILCD_SUBDIR@ \
 #endif SILC_DIST_SERVER
 #ifdef SILC_DIST_CLIENT
-       irssi \
+       @IRSSI_SUBDIR@ \
 #endif SILC_DIST_CLIENT
 

diff --git a/apps/autodist/autodist.in b/apps/autodist/autodist.in
index 85f36d9ded0481afe8d6e3db44a8d2f7a2ee7667..2669347c95cd69ff8f99a3b585d692e0b02f88a9 100755 (executable)
--- a/apps/autodist/autodist.in
+++ b/apps/autodist/autodist.in
@@ -228,7 +228,7 @@ ad_initialize()
 
   # Create default distdir
   if test '!' -f $distdir; then
-    mkdir -p $distdir
+    mkdir -p -- $distdir
   fi
 
   # Create Autodist configuration file
@@ -642,7 +642,7 @@ ad_dist_includes()
         d=`echo $src | sed 's,/[^/]*$,,'`
         if test "$d" != "$src" && test "$d" != "." && \
           test '!' -d $am_distdir/$d; then
-          mkdir -p $am_distdir/$d || exit 1
+          mkdir -p -- $am_distdir/$d || exit 1
         fi
       else
         # Add to different location
@@ -654,7 +654,7 @@ ad_dist_includes()
         d=`echo $dst | sed 's,/[^/]*$,,'`
         if test "$d" != "$dst" && test "$d" != "." && \
           test '!' -d $am_distdir/$d; then
-          mkdir -p $am_distdir/$d || exit 1
+          mkdir -p -- $am_distdir/$d || exit 1
         fi
       fi
 
@@ -677,7 +677,7 @@ ad_dist_includes()
          d=""
        fi
        if test '!' -d $am_distdir/$d && test "$ds" != "$d"; then
-          mkdir -p $am_distdir/$d || exit 1
+          mkdir -p -- $am_distdir/$d || exit 1
        fi
 
        if test x$3 = xtrue; then
@@ -697,7 +697,7 @@ ad_dist_includes()
           d=`echo $d | sed 's,/[^/]*$,,'`
         fi
         if test '!' -d $am_distdir/$d && test "$dst" != "$d"; then
-          mkdir -p $am_distdir/$d || exit 1
+          mkdir -p -- $am_distdir/$d || exit 1
         fi
 
        if test x$3 = xtrue; then
@@ -1456,7 +1456,7 @@ ad_process_noprocess()
 
     f="$cur/autodist__noprocess"
     rm -rf $f
-    mkdir -p $f || exit 1
+    mkdir -p -- $f || exit 1
 
     # First, include them to new location with correct directory structure.
     old_am_distdir="$am_distdir"

diff --git a/apps/irssi/configure.ad b/apps/irssi/configure.ad
index 56cd63c50d912a7b787b668d37435b1182648cdb..4b3b1b7ff8ff32bb1575cf9c69d8c881365a61d5 100644 (file)
--- a/apps/irssi/configure.ad
+++ b/apps/irssi/configure.ad
@@ -20,6 +20,14 @@
 # for getting irssi specific stuff to top configure script with Autodist
 # without polluting the top configure.ad file with these stuff.
 
+IRSSI_SUBDIR=
+
+#ifdef SILC_DIST_TOOLKIT
+if test x$without_irssi = xfalse; then
+#endif SILC_DIST_TOOLKIT
+
+IRSSI_SUBDIR=irssi
+
 # help directory
 #
 HELPDIR="$silc_prefix/help"
@@ -44,17 +52,16 @@ AC_ARG_WITH(perl,
                                if it should be built into main silc binary
                                (static, default) or as a module]])
 
-#ifdef SILC_DIST_TOOLKIT
-if test x$without_irssi = xfalse; then
-#endif SILC_DIST_TOOLKIT
-  AC_CONFIG_SUBDIRS(apps/irssi)
-  AC_CONFIG_FILES(
+AC_CONFIG_SUBDIRS(apps/irssi)
+AC_CONFIG_FILES(
 apps/irssi/Makefile.defines
 apps/irssi/Makefile.defines_int
 )
-  irssi="yes"
+
+irssi="yes"
 #ifdef SILC_DIST_TOOLKIT
-fi
+fi     # without_irssi = false
 #endif SILC_DIST_TOOLKIT
 
+AC_SUBST(IRSSI_SUBDIR)
 #endif SILC_DIST_CLIENT

diff --git a/apps/silcd/configure.ad b/apps/silcd/configure.ad
index bb07752832ba34ef551708c69f39f6d99d4758b9..c39b95d9976db2c63a3e408572e5d5f559891349 100644 (file)
--- a/apps/silcd/configure.ad
+++ b/apps/silcd/configure.ad
@@ -16,6 +16,14 @@
 #  GNU General Public License for more details.
 #
 
+SILCD_SUBDIR=
+
+#ifdef SILC_DIST_TOOLKIT
+if test x$without_silcd = xfalse; then
+#endif SILC_DIST_TOOLKIT
+
+SILCD_SUBDIR=silcd
+
 # Logs directory
 #
 LOGSDIR="$silc_prefix/logs"
@@ -65,16 +73,15 @@ AC_ARG_WITH(silcd-pid-file,
   ])
 AC_SUBST(PIDFILE)
 
-#ifdef SILC_DIST_TOOLKIT
-if test x$without_silcd = xfalse ; then
-#endif SILC_DIST_TOOLKIT
-  AC_CONFIG_FILES(
+AC_CONFIG_FILES(
 apps/silcd/Makefile
 doc/example_silcd.conf
 )
+
+silcd="yes"
 #ifdef SILC_DIST_TOOLKIT
-fi
+fi     # without_silcd = false
 #endif SILC_DIST_TOOLKIT
 
-silcd="yes"
+AC_SUBST(SILCD_SUBDIR)
 #endif SILC_DIST_SERVER

diff --git a/configure.ad b/configure.ad
index a211e1eb75c0e5154dc048b53b830ba6ce3b7f1a..c135eab30a3641464f8bd2aba36c53726dbae41e 100644 (file)
--- a/configure.ad
+++ b/configure.ad
@@ -983,32 +983,32 @@ AM_CONDITIONAL(SILC_BEOS, test xfalse = xtrue)
 AM_CONDITIONAL(SILC_OS2, test xfalse = xtrue)
 
 #ifdef SILC_DIST_TOOLKIT
-# --without-irssi
+# --with-irssi
 #
-without_irssi=false
+without_irssi=true
 AC_MSG_CHECKING(whether to compile Irssi SILC Client)
 AC_ARG_WITH(irssi,
-  [  --without-irssi         compile without Irssi SILC Client],
+  [  --with-irssi            compile with Irssi SILC Client],
   [
-    AC_MSG_RESULT(no)
-    without_irssi=true
+    AC_MSG_RESULT(yes)
   ],
   [
-    AC_MSG_RESULT(yes)
+    AC_MSG_RESULT(no)
+    without_irssi=false
   ])
 
-# --without-silcd
+# --with-silcd
 #
-without_silcd=false
+without_silcd=true
 AC_MSG_CHECKING(whether to compile SILC Server)
 AC_ARG_WITH(silcd,
-  [  --without-silcd         compile without SILC Server],
+  [  --with-silcd            compile with SILC Server],
   [
-    AC_MSG_RESULT(no)
-    without_silcd=true
+    AC_MSG_RESULT(yes)
   ],
   [
-    AC_MSG_RESULT(yes)
+    AC_MSG_RESULT(no)
+    without_silcd=false
   ])
 #endif SILC_DIST_TOOLKIT