summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimo Sirainen <cras@irssi.org>2001-12-04 15:15:14 +0000
committercras <cras@dbcabf3a-b0e7-0310-adc4-f8d773084564>2001-12-04 15:15:14 +0000
commitc9d4a35bd865ce6e7d94f698ac88c86bde761707 (patch)
tree464b6e685db34039584af69a31bba2a5d8e35953
parent6e187b4a9a9b22d16bd3a36806fabf3f58bcaddf (diff)
downloadirssi-c9d4a35bd865ce6e7d94f698ac88c86bde761707.zip
Moved the VERSION-removal of config.h.in to configure from autogen because
"make dist" ran autoheader again and the VERSION wasn't removed. git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2196 dbcabf3a-b0e7-0310-adc4-f8d773084564
-rwxr-xr-xautogen.sh4
-rw-r--r--configure.in6
2 files changed, 6 insertions, 4 deletions
diff --git a/autogen.sh b/autogen.sh
index dff280d8..490ae870 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -99,10 +99,6 @@ aclocal $aclocalinclude
if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
echo "Running autoheader..."
autoheader
-
- # we don't want VERSION in our config.h
- grep -v '^#undef VERSION' config.h.in > config.h.in.temp
- mv -f config.h.in.temp config.h.in
fi
echo "Running autoconf ..."
autoconf
diff --git a/configure.in b/configure.in
index afadddc7..23596412 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,11 @@
AC_INIT(src)
+# we don't want VERSION in our config.h
+if test -n "`grep '^#undef VERSION' config.h.in`"; then
+ grep -v '^#undef VERSION' config.h.in > config.h.in.temp
+ mv -f config.h.in.temp config.h.in
+fi
+
AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE(irssi, 0.7.98.CVS)