diff options
| author | TingPing <tngpng@gmail.com> | 2013-07-26 11:55:37 -0700 |
|---|---|---|
| committer | TingPing <tngpng@gmail.com> | 2013-07-26 11:55:37 -0700 |
| commit | 1fd94e79b90b25d3b78c8a7468acbfb4a0d47dd7 (patch) | |
| tree | 5aec1ed2b59103e048292aa77738622651f202a1 | |
| parent | bb3cb269c21e4f3dbde0ee1fdbdad627c57eba8b (diff) | |
| parent | e63ec01089a53facfe55e33e8dd90ff7f853eb38 (diff) | |
Merge pull request #679 from hasufell/libtool
MAKE: backwards compat for old libtool
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rwxr-xr-x | autogen.sh | 4 | ||||
| -rw-r--r-- | configure.ac | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 073fd4b2..41e95375 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in +ACLOCAL_AMFLAGS = -I m4 + SUBDIRS = po intl src plugins man share EXTRA_DIST = autogen.sh diff --git a/autogen.sh b/autogen.sh index 7a640a56..607aa949 100755 --- a/autogen.sh +++ b/autogen.sh @@ -78,7 +78,7 @@ if test "$?" != "0"; then exit 2 fi echo running libtoolize... -libtoolize --force +libtoolize --copy --force --install if test "$?" != "0"; then echo libtoolize failed, stopping. exit 3 @@ -90,7 +90,7 @@ if test "$?" != "0"; then exit 4 fi echo running $AUTOMAKE... -$AUTOMAKE -a +$AUTOMAKE -a -c if test "$?" != "0"; then echo automake failed, stopping. exit 5 diff --git a/configure.ac b/configure.ac index d4acd0aa..6af91d77 100644 --- a/configure.ac +++ b/configure.ac @@ -8,8 +8,9 @@ AC_COPYRIGHT([Copyright (C) 1998-2010 Peter Zelezny]) AC_CONFIG_HEADERS([config.h]) 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]) AC_USE_SYSTEM_EXTENSIONS |