Commit 96cd5dd4d353314c49829a92556bd830f8d17eac
1 parent
94396618
add M4 option
Showing
2 changed files
with
26 additions
and
9 deletions
Makefile.am
| 1 | +## Process this file with automake to produce Makefile.in | ||
| 2 | + | ||
| 3 | +# Include M4 macros | ||
| 4 | +ACLOCAL_AMFLAGS = -I m4 | ||
| 5 | + | ||
| 6 | +# Subdirectories | ||
| 1 | SUBDIRS = . src pyext | 7 | SUBDIRS = . src pyext |
| 2 | 8 | ||
| 9 | +# | ||
| 10 | +INCLUDES = | ||
| 11 | + | ||
| 12 | +# | ||
| 3 | CLEANFILES = | 13 | CLEANFILES = |
| 14 | + | ||
| 15 | +# Extra files to be distributed in the tar file | ||
| 4 | EXTRA_DIST = autogen.sh | 16 | EXTRA_DIST = autogen.sh |
| 5 | -INCLUDES = | ||
| 6 | 17 |
configure.ac
| 1 | -# Process this file with autoconf to produce a configure script. | ||
| 2 | - | 1 | +dnl ============================================================= |
| 2 | +dnl Process this file with autoconf to produce a configure script | ||
| 3 | +dnl ============================================================= | ||
| 3 | AC_INIT([ctatools], [0.1.0], [knodlseder@cesr.fr]) | 4 | AC_INIT([ctatools], [0.1.0], [knodlseder@cesr.fr]) |
| 4 | AC_CONFIG_SRCDIR([src/ctselect/ctselect.cpp]) | 5 | AC_CONFIG_SRCDIR([src/ctselect/ctselect.cpp]) |
| 6 | +AC_CONFIG_MACRO_DIR([m4]) | ||
| 5 | AC_CONFIG_HEADERS([config.h]) | 7 | AC_CONFIG_HEADERS([config.h]) |
| 6 | AM_INIT_AUTOMAKE | 8 | AM_INIT_AUTOMAKE |
| 7 | 9 | ||
| @@ -18,9 +20,11 @@ dnl ================================= | @@ -18,9 +20,11 @@ dnl ================================= | ||
| 18 | dnl Checks for debugging or profiling | 20 | dnl Checks for debugging or profiling |
| 19 | dnl ================================= | 21 | dnl ================================= |
| 20 | AC_MSG_CHECKING(whether to enable debugging) | 22 | AC_MSG_CHECKING(whether to enable debugging) |
| 21 | -AC_ARG_ENABLE(debug, | ||
| 22 | - [ --enable-debug turn on debugging (default=no)], | ||
| 23 | - [enable_debug="$enableval"]) | 23 | +AC_ARG_ENABLE([debug], |
| 24 | + AS_HELP_STRING([--enable-debug], | ||
| 25 | + [turn on debugging (default=no)]), | ||
| 26 | + [enable_debug="$enableval"], | ||
| 27 | + [enable_debug="no"]) | ||
| 24 | if test "x$enable_debug" = "xyes"; then | 28 | if test "x$enable_debug" = "xyes"; then |
| 25 | CFLAGS="$CFLAGS -g" | 29 | CFLAGS="$CFLAGS -g" |
| 26 | CXXFLAGS="$CXXFLAGS -g" | 30 | CXXFLAGS="$CXXFLAGS -g" |
| @@ -31,9 +35,11 @@ else | @@ -31,9 +35,11 @@ else | ||
| 31 | AC_MSG_RESULT(no) | 35 | AC_MSG_RESULT(no) |
| 32 | fi | 36 | fi |
| 33 | AC_MSG_CHECKING(whether to enable profiling) | 37 | AC_MSG_CHECKING(whether to enable profiling) |
| 34 | -AC_ARG_ENABLE(debug, | ||
| 35 | - [ --enable-profiling turn on profiling (default=no)], | ||
| 36 | - [enable_profiling="$enableval"]) | 38 | +AC_ARG_ENABLE([profiling], |
| 39 | + AS_HELP_STRING([--enable-profiling], | ||
| 40 | + [turn on profiling (default=no)]), | ||
| 41 | + [enable_profiling="$enableval"], | ||
| 42 | + [enable_profiling="no"]) | ||
| 37 | if test "x$enable_profiling" = "xyes"; then | 43 | if test "x$enable_profiling" = "xyes"; then |
| 38 | CFLAGS="$CFLAGS -pg" | 44 | CFLAGS="$CFLAGS -pg" |
| 39 | CXXFLAGS="$CXXFLAGS -pg" | 45 | CXXFLAGS="$CXXFLAGS -pg" |