updates.

diff --git a/Makefile.defines.pre b/Makefile.defines.pre
index c5415ccd0de27c1831df97c17113dda2787ddc3b..bac184503781cb1fa8d9ea1e3a6e442e802be3ec 100644 (file)
--- 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 de4dafe1cd07943b2d46c236d6b33e90cd60fe90..a8e1077dbc4a3741ce709be7f83f84ede70c8750 100644 (file)
--- 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 cb258c466c8bd5545c2bc5aee5b9fe5bc816b473..03a6b11889846e1347a67ba24e2422faadb73494 100755 (executable)
--- 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 33d16935d4b746305f82912db745c74227a2cdc3..f29d14782330f80304efc81c24d7df32f5c784a5 100644 (file)
--- 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 3fac2eaf5aac74f6ad6c0c8823aad29246d94edc..5b0524cea122dee201c01144c1d7ed7114147660 100644 (file)
--- 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 ae760976a933ac2dc7b89736442d4d0fcdfce321..cca511fcc8f32108d8272c04e21955afee83a0ee 100755 (executable)
--- 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`