Tue Jan 4 13:06:26 CET 2005 Jochen Eisinger <jochen@penguin-breeder.org>

	* Adopt configuration toolchain to current auto-tools.
	  Affected files prepare, irssi/configure.in

diff --git a/apps/irssi/configure.in b/apps/irssi/configure.in
index 4e36a6ad61bb5e470f841dd5e0ba4cac38cb79b0..d925185d1ff6c02766b96e20367b44b610852035 100644 (file)
--- a/apps/irssi/configure.in
+++ b/apps/irssi/configure.in
@@ -664,6 +664,7 @@ AM_CONDITIONAL(HAVE_PERL, test "$want_perl" != "no")
 AM_CONDITIONAL(HAVE_STATIC_PERL, test "$want_perl" = "static")
 AM_CONDITIONAL(NEED_TPARM, test "$need_tparm" = "yes")
 AM_CONDITIONAL(USE_CURSES, test "$want_terminfo" != "yes" -a "$want_termcap" != "yes")
+AM_CONDITIONAL(BUILD_SERVERTEST, false)
 
 # move LIBS to PROG_LIBS so they're not tried to be used when linking eg. perl libraries
 PROG_LIBS=$LIBS

diff --git a/prepare b/prepare
index 4f74fe06278d75d8b93c664de94075fcd9eb4734..870e70fa7006b9f731ca1f37fd6c8fcdf12eb09a 100755 (executable)
--- a/prepare
+++ b/prepare
@@ -151,6 +151,8 @@ rm -f configure.in2 configure.in3 configure.in4 am_cond
 #
 cp Makefile.defines.pre Makefile.defines.in
 cp Makefile.defines_int.pre Makefile.defines_int.in
+cp Makefile.defines.in irssi
+cp Makefile.defines_int.in irssi
 
 aclocal
 autoconf
@@ -158,17 +160,6 @@ autoheader >/dev/null 2>/dev/null
 libtoolize --automake --copy
 automake
 
-#echo "Preparing mpi"
-#cp Makefile.defines.in lib/silcmath/mpi
-#cp Makefile.defines_int.in lib/silcmath/mpi
-#cd lib/silcmath/mpi
-#aclocal
-#autoconf
-#autoheader >/dev/null 2>/dev/null
-#libtoolize --automake --copy
-#automake >/dev/null 2>/dev/null
-#cd ../../..
-
 file=includes/version_internal.h
 echo "/* Automatically generated by ./prepare */" >$file
 echo "#define SILC_VERSION_STRING \"$dist_version\"" >>$file
@@ -178,12 +169,11 @@ echo "#define SILC_NAME \"SILC $distribution\"" >>$file
 
 # preparing irssi
 echo "Preparing irssi"
-cp Makefile.defines.in irssi
-cp Makefile.defines_int.in irssi
+file=irssi/irssi-version.h.in
+touch $file
 cd irssi
 sh autogen.sh 2>/dev/null 1>/dev/null
 cd ..
-file=irssi/irssi-version.h.in
 version_date=`date +%Y%m%d`
 echo "/* automatically created by autogen.sh */" > $file
 echo "#define IRSSI_VERSION \"$dist_version (Irssi base: @VERSION@ - SILC base: SILC $dist_version)\"" >>$file