From a20afb4a4ac697824f5dd79d4163be4c0dca73ba Mon Sep 17 00:00:00 2001
From: Pekka Riikonen <priikone@silcnet.org>
Date: Tue, 29 May 2001 12:07:25 +0000
Subject: [PATCH] 	updates.

---
 Makefile.defines.pre    | 9 ++++++++-
 apps/irssi/Makefile.am  | 4 +++-
 apps/irssi/autogen.sh   | 1 +
 apps/irssi/configure.in | 4 +++-
 configure.in.pre        | 2 ++
 prepare                 | 2 +-
 6 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/Makefile.defines.pre b/Makefile.defines.pre
index c5415ccd..bac18450 100644
--- a/Makefile.defines.pre
+++ b/Makefile.defines.pre
@@ -26,8 +26,15 @@
 #
 # include $(top_srcdir)/Makefile.defines
 #
+#
+# All packages in the SILC source tree that include the Makefile.defines
+# must also include the following two lines in their configure.in file.
+#
+# INCLUDE_DEFINES_INT="include \$(top_srcdir)/Makefile.defines_int"   
+# AC_SUBST(INCLUDE_DEFINES_INT)
+#
 
-include $(top_srcdir)/Makefile.defines_int
+@INCLUDE_DEFINES_INT@
 
 #
 # INCLUDE defines
diff --git a/apps/irssi/Makefile.am b/apps/irssi/Makefile.am
index de4dafe1..a8e1077d 100644
--- a/apps/irssi/Makefile.am
+++ b/apps/irssi/Makefile.am
@@ -20,7 +20,9 @@ EXTRA_DIST = \
 	irssi.spec \
 	irssi.spec.in \
 	$(conf_DATA) \
-	irssi-config.in
+	irssi-config.in \
+	Makefile.defines.in \
+	Makefile.defines_int.in
 
 ## make rpms
 rpm: Makefile
diff --git a/apps/irssi/autogen.sh b/apps/irssi/autogen.sh
index cb258c46..03a6b118 100755
--- a/apps/irssi/autogen.sh
+++ b/apps/irssi/autogen.sh
@@ -2,6 +2,7 @@
 # Run this to generate all the initial makefiles, etc.
 
 srcdir=`dirname $0`
+echo $0
 test -z "$srcdir" && srcdir=.
 
 PKG_NAME="Irssi SILC"
diff --git a/apps/irssi/configure.in b/apps/irssi/configure.in
index 33d16935..f29d1478 100644
--- a/apps/irssi/configure.in
+++ b/apps/irssi/configure.in
@@ -996,6 +996,9 @@ if test "x$want_ipv6" = "xyes"; then
 	AC_DEFINE(HAVE_IPV6)
 fi
 
+INCLUDE_DEFINES_INT="include \$(top_srcdir)/Makefile.defines_int"
+AC_SUBST(INCLUDE_DEFINES_INT)
+
 AC_OUTPUT(
 Makefile
 src/Makefile
@@ -1077,4 +1080,3 @@ if test "x$want_perl" = "xyes"; then
 	fi
 fi
 echo "Install prefix ............. : $prefix"
-
diff --git a/configure.in.pre b/configure.in.pre
index 3fac2eaf..5b0524ce 100644
--- a/configure.in.pre
+++ b/configure.in.pre
@@ -396,6 +396,8 @@ AC_CONFIG_SUBDIRS(lib/trq)
 SILC_TOP_SRCDIR=`pwd`
 AC_SUBST(SILC_TOP_SRCDIR)
 AC_SUBST(LIBS)
+INCLUDE_DEFINES_INT="include \$(top_srcdir)/Makefile.defines_int"
+AC_SUBST(INCLUDE_DEFINES_INT)
 
 #
 # Makefile outputs
diff --git a/prepare b/prepare
index ae760976..cca511fc 100755
--- a/prepare
+++ b/prepare
@@ -121,7 +121,7 @@ echo "#define SILC_PROTOCOL_VERSION_STRING \"SILC-1.0-$version\"" >>$file
 
 # preparing irssi
 cd irssi
-sh autogen.sh 2>/dev/null 1>/dev/null
+sh autogen.sh
 cd ..
 file=irssi/irssi-version.h.in
 version_date=`date +%Y%m%d`
-- 
2.24.0