Author: biurrun Date: Tue Nov 10 17:39:20 2009 New Revision: 1618 Log: Move some macro calls around to have a more clear structure in the file. Modified: trunk/configure.ac Modified: trunk/configure.ac ============================================================================== --- trunk/configure.ac Tue Nov 10 17:35:46 2009 (r1617) +++ trunk/configure.ac Tue Nov 10 17:39:20 2009 (r1618) @@ -11,6 +11,7 @@ AC_INIT(pisa, [PISA_VERSION], pisa@xxxxxxxxxxxxx) AC_CONFIG_AUX_DIR(config) +AC_CONFIG_FILES([Makefile]) AC_CONFIG_HEADERS([config.h]) AM_INIT_AUTOMAKE([foreign subdir-objects]) @@ -32,43 +33,43 @@ # compile-time options +AC_MSG_CHECKING([whether to have verbose debug]) AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], [debug mode (default=yes)]), [enable_debug=$enableval], [enable_debug=yes]) -AC_MSG_CHECKING([whether to have verbose debug]) -AC_MSG_RESULT([$enable_debug]) if test x"$enable_debug" = x"yes"; then AC_DEFINE(CONFIG_PISA_DEBUG) AH_TEMPLATE(CONFIG_PISA_DEBUG) fi +AC_MSG_RESULT([$enable_debug]) +AC_MSG_CHECKING([whether to use performance measurement]) AC_ARG_ENABLE(performance, AC_HELP_STRING([--enable-performance], [performance measurement (default=no)]), [enable_performance=$enableval], [enable_performance=no]) -AC_MSG_CHECKING([whether to use performance measurement]) -AC_MSG_RESULT([$enable_performance]) if test x"$enable_performance" = x"yes"; then AC_DEFINE(CONFIG_PISA_PERFORMANCE) AH_TEMPLATE(CONFIG_PISA_PERFORMANCE) fi AM_CONDITIONAL(PISA_PERFORMANCE, test x"$enable_performance" = x"yes") +AC_MSG_RESULT([$enable_performance]) +AC_MSG_CHECKING([whether to use logging]) AC_ARG_ENABLE(logging, AC_HELP_STRING([--enable-logging], [logging (default=no)]), [enable_logging=$enableval], [enable_logging=no]) -AC_MSG_CHECKING([whether to use logging]) -AC_MSG_RESULT([$enable_logging]) if test x"$enable_logging" = x"yes"; then AC_DEFINE(CONFIG_PISA_LOGGING) AH_TEMPLATE(CONFIG_PISA_LOGGING) fi AM_CONDITIONAL(PISA_LOGGING, test x"$enable_logging" = x"yes") +AC_MSG_RESULT([$enable_logging]) # Set default AM_CFLAGS for the complete project. @@ -88,5 +89,4 @@ AH_TEMPLATE([PISA_SYSCONFDIR]) -AC_CONFIG_FILES([Makefile]) AC_OUTPUT