From b0af812652269a59457ad1bbf57165c0543bcd07 Mon Sep 17 00:00:00 2001 From: Nicolas Bock Date: Fri, 27 Sep 2013 10:49:52 -0600 Subject: [PATCH 1/4] Commented out colliding defines in conv-autoconfig.h The colliding defines (bug #252) are commented out in configure. --- src/scripts/configure | 5 +++++ src/scripts/configure.in | 3 +++ 2 files changed, 8 insertions(+) diff --git a/src/scripts/configure b/src/scripts/configure index acd582c..faf268f 100755 --- a/src/scripts/configure +++ b/src/scripts/configure @@ -1703,6 +1703,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_config_headers="$ac_config_headers conv-autoconfig.h" +ac_config_commands="$ac_config_commands config-cleanup" + + CHARMINC="." test -r ./conv-config.sh && . ./conv-config.sh @@ -5259,6 +5262,7 @@ for ac_config_target in $ac_config_targets do case $ac_config_target in "conv-autoconfig.h") CONFIG_HEADERS="$CONFIG_HEADERS conv-autoconfig.h" ;; + "config-cleanup") CONFIG_COMMANDS="$CONFIG_COMMANDS config-cleanup" ;; "libs/ck-libs/ampi/ampiCC") CONFIG_FILES="$CONFIG_FILES libs/ck-libs/ampi/ampiCC" ;; "libs/ck-libs/ampi/ampirun") CONFIG_FILES="$CONFIG_FILES libs/ck-libs/ampi/ampirun" ;; "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; @@ -5812,6 +5816,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} case $ac_file$ac_mode in + "config-cleanup":C) sed -i -e 's:^#define\s\+PACKAGE://&:' conv-autoconfig.h ;; "default":C) chmod +x libs/ck-libs/ampi/ampiCC libs/ck-libs/ampi/ampirun ;; diff --git a/src/scripts/configure.in b/src/scripts/configure.in index d1285ed..cad9a42 100644 --- a/src/scripts/configure.in +++ b/src/scripts/configure.in @@ -3,6 +3,9 @@ AC_INIT(./Makefile) AC_CONFIG_HEADER(conv-autoconfig.h) +AC_CONFIG_COMMANDS([config-cleanup], + [sed -i -e 's:^#define\s\+PACKAGE://&:' conv-autoconfig.h]) + CHARMINC="." test -r ./conv-config.sh && . ./conv-config.sh -- 1.8.1.5