Changeset 720

Timestamp:

Dec 3, 2008, 4:37:30 PM (14 years ago)

Author:

Peter Johansson

Message:

let aclocal know about build_support rather than including files explicitely

Location:

trunk

Files:

• Makefile.am (modified) (1 diff)
• configure.ac (modified) (2 diffs)

trunk/Makefile.am

@@ -21 +21 @@
 # along with svndigest. If not, see <http://www.gnu.org/licenses/>.
 
+# -I arg should be the same as arg in AC_CONFIG_MACRO_DIR in configure.ac
+ACLOCAL_AMFLAGS = -I build_support --install
+
 SUBDIRS = lib bin test
 

trunk/configure.ac

@@ -32 +32 @@
 
 
-m4_include([./build_support/version.m4])
+m4_include([build_support/version.m4])
 AC_INIT([svndigest],[SVNDIGEST_VERSION],[jari@thep.lu.se])
 AC_CONFIG_SRCDIR([lib/File.h])
 AC_CONFIG_AUX_DIR([autotools])
+dnl arg below should be the same as in Makefile.am
+AC_CONFIG_MACRO_DIR([build_support])
 AC_PREFIX_DEFAULT([/usr/local])
 test $prefix = NONE && prefix=/usr/local
@@ -103 +105 @@
 # AC_SEARCH_LIBS([apr_allocator_create],[apr-0],,apr_found="no") but
 # apr-0 must be prior knowledge.
-m4_sinclude(./build_support/find_apr.m4)
 APR_FIND_APR(,,1,[1 0])
 if test "$apr_found" = "yes" ; then