Changeset 907

Timestamp:

Nov 29, 2009, 4:33:19 PM (14 years ago)

Author:

Peter Johansson

Message:

Autoconf 2.63 is now required (closes #414).

refs #380. A first implementation of svndigest-copy-cache. It is is
written in M4sh. Autoconf compiles the source in
svndigest-copy-cache.as to svndigest-copy-cache.in, which in turn is
processed by config.status to replace some keywords such as PACKAGE
and friends. There is no docs and no test yet.

added *.as in config file

Location:

trunk

Files:

• .svndigest/config (modified) (1 diff)
• README.developer (modified) (1 diff)
• bin/Makefile.am (modified) (2 diffs)
• bin/svndigest-copy-cache.as (added)
• configure.ac (modified) (3 diffs)

trunk/.svndigest/config

@@ -50 +50 @@
 *.am = "#":"\n"
 *.m4 = "#":"\n"  ;  "dnl":"\n"
+*.as = "#":"\n"  ;  "dnl":"\n"
 *.c = "//":"\n"  ;  "/*":"*/"
 *.cc = "//":"\n"  ;  "/*":"*/"

trunk/README.developer

@@ -24 +24 @@
 
 To build from a subversion checkout, you will need Autotools. More
-specifically Automake 1.10 (or later) and Autoconf 2.61 (or later). To
+specifically Automake 1.10 (or later) and Autoconf 2.63 (or later). To
 build man page you will need help2man.
 

trunk/bin/Makefile.am

@@ -28 +28 @@
 noinst_HEADERS = Parameter.h
 
+bin_SCRIPTS = svndigest-copy-cache
+EXTRA_DIST = svndigest-copy-cache.as
+
 LDADD = $(top_builddir)/lib/libsvndigest.a \
   $(top_builddir)/lib/yat/libyat.a $(SVN_LIBS) $(APR_LIBS) $(PLPLOT_LIBS)
@@ -36 +39 @@
 AM_CXXFLAGS = $(DEFAULT_CXXFLAGS)
 
+.as.in:
+  $(AUTOM4TE) -l M4sh -o $@ -m 0444 $<
+
+MAINTAINERCLEANFILES = svndigest-copy-cache.in
+
 clean-local: 
   rm -rf *~

trunk/configure.ac

@@ -29 +29 @@
 # along with svndigest. If not, see <http://www.gnu.org/licenses/>.
 
-AC_PREREQ(2.61)
+AC_PREREQ([2.63])
 
 m4_include([m4/version.m4])
@@ -43 +43 @@
 m4_ifndef([AC_PACKAGE_URL], 
           [AC_DEFINE([PACKAGE_URL], ["http://dev.thep.lu.se/svndigest"],
-                     [Define to home page for this package])])
+                     [Define to home page for this package])
+           AC_SUBST([PACKAGE_URL], ["http://dev.thep.lu.se/svndigest"])])
 
 AC_SUBST([SVNDIGEST_MAJOR_VERSION], [MAJOR_VERSION])
@@ -60 +61 @@
 AC_CONFIG_HEADER([config.h])
 AM_INIT_AUTOMAKE([1.10 std-options])
+
+dnl create bin/svndigest-copy-cache.in at autoconf time and let
+dnl config.status create bin/svndigest-copy-cache from
+dnl bin/svndigest-copy-cache.in
+m4_pushdef([FILE], [svndigest-copy-cache])
+m4_pushdef([my_m4sh_options], [-m 0444])
+dnl me cd down in bin to have same output as when created from Makefile
+m4_syscmd([cd bin && autom4te -l M4sh -o ]FILE[.in ]my_m4sh_options FILE[.as])
+AC_CONFIG_FILES([bin/]FILE[], [chmod +x bin/]FILE[ && chmod a-w bin/]FILE[])
+dnl export options so we can use the same in Makefile
+AC_SUBST([M4SH_OPTIONS], ['my_m4sh_options'])
+m4_popdef([my_m4sh_options])
+m4_popdef([FILE])
+AM_MISSING_PROG([AUTOM4TE], [autom4te])
 
 # Set default programming language