Merge pull request #679 from hasufell/libtool
MAKE: backwards compat for old libtool
This commit is contained in:
commit
1fd94e79b9
|
@ -1,5 +1,7 @@
|
||||||
## Process this file with automake to produce Makefile.in
|
## Process this file with automake to produce Makefile.in
|
||||||
|
|
||||||
|
ACLOCAL_AMFLAGS = -I m4
|
||||||
|
|
||||||
SUBDIRS = po intl src plugins man share
|
SUBDIRS = po intl src plugins man share
|
||||||
|
|
||||||
EXTRA_DIST = autogen.sh
|
EXTRA_DIST = autogen.sh
|
||||||
|
|
|
@ -78,7 +78,7 @@ if test "$?" != "0"; then
|
||||||
exit 2
|
exit 2
|
||||||
fi
|
fi
|
||||||
echo running libtoolize...
|
echo running libtoolize...
|
||||||
libtoolize --force
|
libtoolize --copy --force --install
|
||||||
if test "$?" != "0"; then
|
if test "$?" != "0"; then
|
||||||
echo libtoolize failed, stopping.
|
echo libtoolize failed, stopping.
|
||||||
exit 3
|
exit 3
|
||||||
|
@ -90,7 +90,7 @@ if test "$?" != "0"; then
|
||||||
exit 4
|
exit 4
|
||||||
fi
|
fi
|
||||||
echo running $AUTOMAKE...
|
echo running $AUTOMAKE...
|
||||||
$AUTOMAKE -a
|
$AUTOMAKE -a -c
|
||||||
if test "$?" != "0"; then
|
if test "$?" != "0"; then
|
||||||
echo automake failed, stopping.
|
echo automake failed, stopping.
|
||||||
exit 5
|
exit 5
|
||||||
|
|
|
@ -8,8 +8,9 @@ AC_COPYRIGHT([Copyright (C) 1998-2010 Peter Zelezny])
|
||||||
AC_CONFIG_HEADERS([config.h])
|
AC_CONFIG_HEADERS([config.h])
|
||||||
AC_CONFIG_SRCDIR([configure.ac])
|
AC_CONFIG_SRCDIR([configure.ac])
|
||||||
|
|
||||||
AM_INIT_AUTOMAKE([1.11 dist-bzip2 subdir-objects no-define foreign])
|
AC_CONFIG_MACRO_DIR([m4])
|
||||||
|
|
||||||
|
AM_INIT_AUTOMAKE([1.11 dist-bzip2 subdir-objects no-define foreign])
|
||||||
AM_SILENT_RULES([yes])
|
AM_SILENT_RULES([yes])
|
||||||
|
|
||||||
AC_USE_SYSTEM_EXTENSIONS
|
AC_USE_SYSTEM_EXTENSIONS
|
||||||
|
|
Loading…
Reference in New Issue