updats.

diff --git a/Makefile.ad b/Makefile.ad
index 404c423e8b738c5befc055624627b20448c59bc8..e2a6a2c67c28bd21b9c2c06fb6495e0402dcf58c 100644 (file)
--- a/Makefile.ad
+++ b/Makefile.ad
@@ -42,6 +42,7 @@ EXTRA_DIST =          \
 #endif SILC_DIST_SILC
 
 #ifdef SILC_DIST_CLIENT
+if with_irssi
 install-dirs-client:
        -mkdir -p $(etcdir)
        -mkdir -p $(helpdir)
@@ -65,6 +66,7 @@ install-data-hook:            \
        install-dirs-client     \
        doc-install-client      \
        etc-install-client
+endif
 #endif SILC_DIST_CLIENT
 
 #ifdef SILC_DIST_SILC

diff --git a/configure.ad b/configure.ad
index d11268dcb941b1d88d9d57986f238021c4e794eb..0182a49af1304f2720cc67d2b01b31732463cb96 100644 (file)
--- a/configure.ad
+++ b/configure.ad
@@ -155,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
 )
@@ -999,6 +999,7 @@ AC_ARG_WITH(irssi,
     AC_MSG_RESULT(no)
     without_irssi=true
   ])
+AM_CONDITIONAL(with_irssi, test xwithout_irssi = xfalse)
 
 # --with-silcd
 #

diff --git a/distdir/pre-dist b/distdir/pre-dist-toolkit
similarity index 80%
rename from distdir/pre-dist
rename to distdir/pre-dist-toolkit
index f17fad054c9f82d44fcbdd86f039151c495843a8..8f2f17ad181ee8fee4e41f753151724f14327ed4 100644 (file)
--- a/distdir/pre-dist
+++ b/distdir/pre-dist-toolkit
@@ -5,6 +5,8 @@ dist_version=$2
 package=$3
 distdir=$4
 
+./configure --with-irssi --with-silcd
+
 cd doc
 make dist-hook
 rm -rf toolkit

diff --git a/distdir/toolkit b/distdir/toolkit
index e276d1cb3a6baf4e6795f084b3b86638c9bfebc7..bb062bd210f0633249209364c876d73ac6573562 100644 (file)
--- a/distdir/toolkit
+++ b/distdir/toolkit
@@ -35,4 +35,6 @@ noprocess lib/silcutil/silcconfig.[ch]
 
 pre-hook distdir/pre-run
 post-process-dist-hook distdir/post-process-dist
+pre-dist-hook distdir/pre-dist-toolkit
 post-dist-hook distdir/post-dist
+