Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Work around a bug in autoreconf 2.61

  • Loading branch information...
commit 401d81cf7554859b3499881ed0a9355970ab1728 1 parent 1be65f3
@SamB SamB authored committed
Showing with 23 additions and 2 deletions.
  1. +1 −2  Makefile
  2. +22 −0 autogen.sh
View
3  Makefile
@@ -58,7 +58,6 @@ endif
override CPPFLAGS += '-DTIG_VERSION="$(VERSION)"'
override CPPFLAGS += '-DSYSCONFDIR="$(sysconfdir)"'
-AUTORECONF ?= autoreconf
ASCIIDOC ?= asciidoc
ASCIIDOC_FLAGS = -aversion=$(VERSION) -asysconfdir=$(sysconfdir)
XMLTO ?= xmlto
@@ -149,7 +148,7 @@ rpm: dist
rpmbuild -ta $(TARNAME).tar.gz
configure: configure.ac acinclude.m4
- $(AUTORECONF) -v -I contrib
+ ./autogen.sh
.PHONY: all all-debug doc doc-man doc-html install install-doc \
install-doc-man install-doc-html clean spell-check dist rpm
View
22 autogen.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+export WARNINGS=all
+set -e
+
+# Ideally, we could just do this:
+#
+#${AUTORECONF:-autoreconf} -v -I contrib
+#
+# Unfortunately, Autoconf 2.61's autoreconf(1) (found in Mac OS X 10.5
+# Leapard) neglects to pass the -I on to aclocal(1), which is
+# precisely where we need it! So we do basically what it would have
+# done.
+
+run () {
+ echo $0: running: "$@"
+ "$@"
+}
+
+run ${ACLOCAL:-aclocal} -I contrib
+run ${AUTOCONF:-autoconf} --include=contrib
+run ${AUTOHEADER:-autoheader} --include=contrib
Please sign in to comment.
Something went wrong with that request. Please try again.