mirror of
https://github.com/irssi/irssi.git
synced 2025-01-03 14:56:47 -05:00
more and more glib*.m4 kludges, maybe it finally works? :)
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2706 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
parent
350c75714c
commit
50647aadd9
18
autogen.sh
18
autogen.sh
@ -106,18 +106,26 @@ if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
|
|||||||
fi
|
fi
|
||||||
aclocalinclude="$ACLOCAL_FLAGS -I ."
|
aclocalinclude="$ACLOCAL_FLAGS -I ."
|
||||||
echo "Running aclocal $aclocalinclude ..."
|
echo "Running aclocal $aclocalinclude ..."
|
||||||
error=`aclocal $aclocalinclude 2>&1`
|
|
||||||
|
|
||||||
# see if we don't have glib.m4 or glib-2.0.m4 there yet
|
# see if we don't have glib.m4 or glib-2.0.m4 there yet
|
||||||
if `echo $error|grep AM_PATH_GLIB_2_0`; then
|
error=`aclocal $aclocalinclude 2>&1`
|
||||||
cp glib-2.0.m4_ glib-2.0.m4
|
if test "x`echo $error|grep AM_PATH_GLIB[^_]`" != "x"; then
|
||||||
fi
|
|
||||||
if `echo $error|grep AM_PATH_GLIB[^_]`; then
|
|
||||||
cp glib.m4_ glib.m4
|
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
|
fi
|
||||||
|
|
||||||
aclocal $aclocalinclude
|
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
|
||||||
|
cp glib-2.0.m4_ glib-2.0.m4
|
||||||
|
aclocal $aclocalinclude
|
||||||
|
fi
|
||||||
|
|
||||||
if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
|
if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
|
||||||
echo "Running autoheader..."
|
echo "Running autoheader..."
|
||||||
autoheader
|
autoheader
|
||||||
|
Loading…
Reference in New Issue
Block a user