summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorJan Engelhardt <jengelh@inai.de>2012-10-27 17:42:40 +0200
committerBerke Viktor <bviktor@hexchat.org>2012-10-27 17:42:40 +0200
commite9c9bd4ebe87f558465ed576ea0ca95a6ae0e555 (patch)
tree6984c5d79cbfe2765656911307a1a2e96c6e9189
parenta46df34a2a224c4af3fea4d576350e53184de232 (diff)
build: move automake "foreign" option to AM_INIT_AUTOMAKE
This works towards allowing using autoreconf(1) later.
-rwxr-xr-xautogen.sh2
-rw-r--r--configure.ac2
2 files changed, 2 insertions, 2 deletions
diff --git a/autogen.sh b/autogen.sh
index 1a620bbf..7a640a56 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -90,7 +90,7 @@ if test "$?" != "0"; then
 	exit 4
 fi
 echo running $AUTOMAKE...
-$AUTOMAKE -a --foreign
+$AUTOMAKE -a
 if test "$?" != "0"; then
 	echo automake failed, stopping.
 	exit 5
diff --git a/configure.ac b/configure.ac
index d638d449..2d5d8417 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([configure.ac])
 AC_CONFIG_MACRO_DIR([m4])
 
-AM_INIT_AUTOMAKE([1.9 dist-bzip2 subdir-objects no-define])
+AM_INIT_AUTOMAKE([1.9 dist-bzip2 subdir-objects no-define foreign])
 
 AC_USE_SYSTEM_EXTENSIONS
 AM_MAINTAINER_MODE