* configure.ac: Catch unexpanded macros starting with `OLN_'. s/OLN_PACKAGE_BUGREPORT/MLN_PACKAGE_BUGREPORT/. s/OLN_PACKAGE_NAME/MLN_PACKAGE_NAME/. s/OLN_PACKAGE_STRING/MLN_PACKAGE_STRING/. s/OLN_PACKAGE_VERSION/MLN_PACKAGE_VERSION/. --- ChangeLog | 10 ++++++++++ configure.ac | 24 ++++++++++++------------ 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index b9e7166..d8de681 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,15 @@ 2009-02-03 Roland Levillain <roland@lrde.epita.fr> + Use Olena-related names in configure.ac. + + * configure.ac: Catch unexpanded macros starting with `OLN_'. + s/OLN_PACKAGE_BUGREPORT/MLN_PACKAGE_BUGREPORT/. + s/OLN_PACKAGE_NAME/MLN_PACKAGE_NAME/. + s/OLN_PACKAGE_STRING/MLN_PACKAGE_STRING/. + s/OLN_PACKAGE_VERSION/MLN_PACKAGE_VERSION/. + +2009-02-03 Roland Levillain <roland@lrde.epita.fr> + Make the building of the bundled Trimesh library optional. * build-aux/trimesh.m4: New. diff --git a/configure.ac b/configure.ac index 64de029..6f1b0d3 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. -m4_pattern_forbid([^MLN_]) +m4_pattern_forbid([^OLN_]) AC_PREREQ([2.61]) @@ -18,17 +18,17 @@ AC_CONFIG_FILES([build-aux/Makefile]) # Automake. AM_INIT_AUTOMAKE([1.10 foreign check-news dist-bzip2 nostdinc -Wall]) -AC_CONFIG_HEADERS([config.h:config.hin] [milena/mln/version.hh]) -# Misc. variables. -AC_DEFINE_UNQUOTED([MLN_PACKAGE_NAME], ["$PACKAGE_NAME"], +# Package metadata. +AC_CONFIG_FILES([milena/mln/version.hh]) +AC_DEFINE_UNQUOTED([OLN_PACKAGE_NAME], ["$PACKAGE_NAME"], [Package Full name.]) -AC_DEFINE_UNQUOTED([MLN_PACKAGE_BUGREPORT], ["$PACKAGE_BUGREPORT"], - [Bug report address.]) -AC_DEFINE_UNQUOTED([MLN_PACKAGE_STRING], ["$PACKAGE_STRING"], - [Full name and version.]) -AC_DEFINE_UNQUOTED([MLN_PACKAGE_VERSION], ["$PACKAGE_VERSION"], - [Package Version.]) +AC_DEFINE_UNQUOTED([OLN_PACKAGE_BUGREPORT], ["$PACKAGE_BUGREPORT"], + [Bug report address.]) +AC_DEFINE_UNQUOTED([OLN_PACKAGE_STRING], ["$PACKAGE_STRING"], + [Full name and version.]) +AC_DEFINE_UNQUOTED([OLN_PACKAGE_VERSION], ["$PACKAGE_VERSION"], + [Package Version.]) ## --------------------- ## @@ -152,8 +152,8 @@ AC_CONFIG_FILES(m4_do([swilena/python/sps-local], ## Configuration. ## ## --------------- ## -# Ask for config.h. -#AM_CONFIG_HEADER([config.h]) +# Ask for config.h creation. +AC_CONFIG_HEADERS([config.h]) # Ask for the Makefile creations. AC_CONFIG_FILES([ -- 1.6.1.2