Merged silc_1_0_branch to trunk.

[silc.git] / apps / irssi / autogen.sh

diff --git a/apps/irssi/autogen.sh b/apps/irssi/autogen.sh
index 5ad69a2724375d696038fbb29bc27b8967ea7a45..57abce89ebd56946f4b3034c8a5a73066349b4dc 100755 (executable)
--- 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"
@@ -27,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..."
 
@@ -88,14 +97,34 @@ 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 --force --copy
 fi
 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
@@ -114,3 +143,7 @@ automake --add-missing --gnu $am_opt
 #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 }'
+