blob: 89834e4d672222d08dd0be27645b5b33a03905d2 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
|
From 04639c20479564a2b5e662d90de953e3f37b0360 Mon Sep 17 00:00:00 2001
From: Nicolas Bock <nicolasbock@gmail.com>
Date: Tue, 23 Jul 2013 11:19:22 -0600
Subject: [PATCH] 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 2629834..03dc778 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
@@ -5201,6 +5204,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" ;;
@@ -5754,6 +5758,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 69e5318..2cb18b6 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
|
GitWeb
