diff options
| author | dos-reis <gdr@axiomatics.org> | 2010-11-26 20:30:28 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2010-11-26 20:30:28 +0000 |
| commit | 79add112a71e07b63e62e3b52f4759de243b00a1 (patch) | |
| tree | 306ae6c923c2e7785bd1ef551e8bf29708668604 /configure.ac | |
| parent | a6eaf7f6bc93fd8d5629332f3c138616914e6b94 (diff) | |
| download | open-axiom-79add112a71e07b63e62e3b52f4759de243b00a1.tar.gz | |
* Makefile.am: New. Automake existing top-level Makefile.in.
* Makefile.in: Generate from Makefile.am.
* config/aclocal.m4: Regenerate.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index 0bcfbd26..37a8d657 100644 --- a/configure.ac +++ b/configure.ac @@ -33,27 +33,27 @@ dnl Makefiles for building OpenAxiom interpreter, compiler, libraries, and dnl auxiliary tools where appropriate. dnl -dnl Most of the macros used in this configure.ac are defined in files -dnl located in the subdirectory config/ -sinclude(config/open-axiom.m4) -sinclude(config/aclocal.m4) -AC_INIT([OpenAxiom], [1.4.0-2010-11-19], +AC_INIT([OpenAxiom], [1.4.0-2010-11-25], [open-axiom-bugs@lists.sf.net]) -AC_CONFIG_AUX_DIR(config) -AC_CONFIG_MACRO_DIR(config) +dnl Most of the macros used in this configure.ac are defined in files +dnl located in the subdirectory config/ +m4_include([config/aclocal.m4]) +AC_CONFIG_AUX_DIR([config]) +AC_CONFIG_MACRO_DIR([config]) dnl Put all configuration macros here AC_CONFIG_HEADERS([config/openaxiom-c-macros.h]) -dnl We don't use Automake yet. -# AM_INIT_AUTOMAKE([foreign]) +AC_CANONICAL_SYSTEM + +dnl Page Automake +AM_INIT_AUTOMAKE([foreign]) AC_PREREQ([2.62]) dnl Simple sanity check. AC_CONFIG_SRCDIR(src/Makefile.in) -AC_CANONICAL_SYSTEM open_axiom_installdir=$libdir/open-axiom/$target/$PACKAGE_VERSION AC_SUBST(open_axiom_installdir) @@ -83,6 +83,8 @@ oa_all_prerequisites= AC_SUBST(oa_all_prerequisites) OPENAXIOM_HOST_COMPILERS +AM_CONDITIONAL([OA_BUILD_GCL], [test x$oa_include_gcl = xyes]) + OPENAXIOM_HOST_DATA_PROPERTIES OPENAXIOM_DYNAMIC_MODULE_SUPPORT @@ -106,7 +108,7 @@ OPENAXIOM_CHECK_MM OPENAXIOM_CHECK_MISC ## We are ready to instantiate makefiles. -OPENAXIOM_MAKEFILE([Makefile]) +AC_CONFIG_FILES([Makefile]) OPENAXIOM_MAKEFILE([src/Makefile]) OPENAXIOM_MAKEFILE([src/lib/Makefile]) OPENAXIOM_MAKEFILE([src/utils/Makefile]) |