X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=apps%2Firssi%2Fautogen.sh;h=57abce89ebd56946f4b3034c8a5a73066349b4dc;hb=c257b555225193e54d85daf541d29578b3c93882;hp=a1ab44a3e176c619d34c58a04cc55ba73a025f94;hpb=9dcec4c5b144c5f81a956a1bd9b699155ebd7a28;p=silc.git

diff --git a/apps/irssi/autogen.sh b/apps/irssi/autogen.sh
index a1ab44a3..57abce89 100755
--- a/apps/irssi/autogen.sh
+++ b/apps/irssi/autogen.sh
@@ -1,10 +1,20 @@
 #!/bin/sh
 # Run this to generate all the initial makefiles, etc.
 
+PKG_NAME="SILC Client"
+
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
-PKG_NAME="Irssi SILC"
+if test ! -f $srcdir/irssi.cvs -a -f $srcdir/configure; then
+  echo
+  echo "Use ./configure instead"
+  echo
+  echo "This script should only be run if you got sources from CVS."
+  echo "If you really want to do this, say:"
+  echo "  touch irssi.cvs"
+  exit 0
+fi
 
 if test ! -f $srcdir/configure.in; then
     echo -n "**Error**: Directory \`$srcdir\' does not look like the"
@@ -15,10 +25,6 @@ fi
 # get versions
 version_date=`date +%Y%m%d`
 
-echo "/* automatically created by autogen.sh */" > irssi-version.h.in
-echo "#define IRSSI_VERSION \"@VERSION@\"" >> irssi-version.h.in
-echo "#define IRSSI_VERSION_DATE \"$version_date\"" >> irssi-version.h.in
-
 # create help files
 echo "Creating help files..."
 perl syntax.pl
@@ -31,7 +37,6 @@ cat docs/help/Makefile.am.gen|sed "s/@HELPFILES@/$files/g"|sed 's/?/\\?/g'|tr '!
 
 # .html -> .txt with lynx
 echo "Documentation: html -> txt..."
-lynx -dump -nolist docs/startup-HOWTO.html > docs/startup-HOWTO.txt
 
 echo "Checking auto* tools..."
 
@@ -80,19 +85,46 @@ if test "$DIE" -eq 1; then
   exit 1
 fi
 
+#if test -z "$*"; then
+#  echo "**Warning**: I am going to run \`configure' with no arguments."
+#  echo "If you wish to pass any to it, please specify them on the"
+#  echo \`$0\'" command line."
+#  echo
+#fi
+
 case $CC in
 xlc )
   am_opt=--include-deps;;
 esac
 
-rm -f aclocal.m4
+rm -f aclocal.m4 glib.m4 glib-2.0.m4
 if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
   echo "Running libtoolize..."
-  libtoolize --copy
+  libtoolize --force --copy
 fi
-aclocalinclude="$ACLOCAL_FLAGS"
+aclocalinclude="$ACLOCAL_FLAGS -I ."
 echo "Running aclocal $aclocalinclude ..."
+
+# see if we don't have glib.m4 or glib-2.0.m4 there yet
+error=`aclocal $aclocalinclude 2>&1`
+if test "x`echo $error|grep 'AM_PATH_GLIB[^_]'`" != "x"; then
+  cp glib.m4_ glib.m4
+  error=`aclocal $aclocalinclude 2>&1`
+fi
+if test "x`echo $error|grep AM_PATH_GLIB_2_0`" != "x"; then
+  cp glib-2.0.m4_ glib-2.0.m4
+fi
+
 aclocal $aclocalinclude
+
+# aclocal for some reason doesn't complain about glib2, so we still need
+# to check it later again..
+if grep "^AC_DEFUN.AM_PATH_GLIB_2_0" aclocal.m4 >/dev/null; then :;
+else
+  cp glib-2.0.m4_ glib-2.0.m4
+  aclocal $aclocalinclude
+fi
+
 if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
   echo "Running autoheader..."
   autoheader
@@ -101,3 +133,17 @@ echo "Running autoconf ..."
 autoconf
 echo "Running automake --gnu $am_opt ..."
 automake --add-missing --gnu $am_opt
+
+#conf_flags="--enable-maintainer-mode --enable-compile-warnings" #--enable-iso-c
+
+#if test x$NOCONFIGURE = x; then
+#  echo Running $srcdir/configure $conf_flags "$@" ...
+#  $srcdir/configure $conf_flags "$@" \
+#  && echo Now type \`make\' to compile $PKG_NAME || exit 1
+#else
+#  echo Skipping configure process.
+#fi
+
+# make sure perl hashes have correct length
+find src/perl -name *.c -o -name *.xs | xargs grep -n hv_store | perl -ne 'if (/"(\w+)",\s*(\d+)/) { print unless $2 == length $1 }'
+