aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d>2008-09-30 20:55:25 +0000
committerkenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d>2008-09-30 20:55:25 +0000
commit800ca7f618b29d0223cd878d1b86d8fea8a654a8 (patch)
treee7afd010db29b5aa1a949bcf043b1bdf8e0587b3
parentb09ba53d06e0a87932178bd1b9f276833ea9d5bc (diff)
downloadprotobuf-800ca7f618b29d0223cd878d1b86d8fea8a654a8.tar.gz
Improve autogen.sh.
git-svn-id: http://protobuf.googlecode.com/svn/trunk@56 630680e5-0e50-0410-840e-4b1c322b438d
-rw-r--r--Makefile.am2
-rwxr-xr-xautogen.sh9
2 files changed, 4 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am
index cd90b6c..52f2caf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,6 +2,8 @@
ACLOCAL_AMFLAGS = -I m4
+AUTOMAKE_OPTIONS = foreign
+
SUBDIRS = src
EXTRA_DIST = \
diff --git a/autogen.sh b/autogen.sh
index 34a4d2e..9650eb7 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -15,13 +15,8 @@ fi
set -ex
-rm -rf autom4te.cache
-
-aclocal-1.9 --force -I m4
-libtoolize -c -f
-autoheader -f -W all
-automake-1.9 --foreign -a -c -f -W all
-autoconf -f -W all,no-obsolete
+# TODO(kenton): Use -Wall and fix the resulting warnings.
+autoreconf -f -i
rm -rf autom4te.cache config.h.in~
exit 0