From 88172fe4fd6605e2df32d832809a521e7d064984 Mon Sep 17 00:00:00 2001 From: Pekka Riikonen Date: Tue, 10 May 2005 15:14:17 +0000 Subject: [PATCH] updats. --- Makefile.ad | 2 ++ configure.ad | 3 ++- distdir/{pre-dist => pre-dist-toolkit} | 2 ++ distdir/toolkit | 2 ++ 4 files changed, 8 insertions(+), 1 deletion(-) rename distdir/{pre-dist => pre-dist-toolkit} (80%) diff --git a/Makefile.ad b/Makefile.ad index 404c423e..e2a6a2c6 100644 --- 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 d11268dc..0182a49a 100644 --- 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 f17fad05..8f2f17ad 100644 --- 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 e276d1cb..bb062bd2 100644 --- 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 + -- 2.43.0