summaryrefslogtreecommitdiff
path: root/lib/make
diff options
context:
space:
mode:
authorallen <allen@17b73243-c579-4c4c-a9d2-2d5706c11dac>2000-01-13 09:15:08 +0000
committerallen <allen@17b73243-c579-4c4c-a9d2-2d5706c11dac>2000-01-13 09:15:08 +0000
commit403bdffb4f8aa31dad1940735bdfd2b3a8cdebdc (patch)
tree100483ff1178b2e02b5181703ce96eaee0e6cee1 /lib/make
parent255df26a2103b5ad5762a6eba6ea78af1349d4db (diff)
config.h -> cctk_config.h
git-svn-id: http://svn.cactuscode.org/flesh/trunk@1247 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'lib/make')
-rwxr-xr-xlib/make/configure8
-rw-r--r--lib/make/configure.in2
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/make/configure b/lib/make/configure
index 78080a7e..359d8a74 100755
--- a/lib/make/configure
+++ b/lib/make/configure
@@ -2828,11 +2828,11 @@ LDFLAGS="$KNOWN_LDFLAGS $LDFLAGS"
: ${L2_CACHE_SIZE="0"}
cat >> confdefs.h <<EOF
-#define CCTK_CACHELINE_BYTES $L2_CACHELINE_BYTES
+#define CCTK_L2_CACHELINE_BYTES $L2_CACHELINE_BYTES
EOF
cat >> confdefs.h <<EOF
-#define CCTK_CACHE_SIZE $L2_CACHE_SIZE
+#define CCTK_L2_CACHE_SIZE $L2_CACHE_SIZE
EOF
@@ -2940,7 +2940,7 @@ done
ac_given_srcdir=$srcdir
-trap 'rm -fr `echo "make.config.defn make.config.deps make.config.rules config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "make.config.defn make.config.deps make.config.rules cctk_config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
EOF
cat >> $CONFIG_STATUS <<EOF
@@ -3147,7 +3147,7 @@ ac_eD='%g'
if test "${CONFIG_HEADERS+set}" != set; then
EOF
cat >> $CONFIG_STATUS <<EOF
- CONFIG_HEADERS="config.h"
+ CONFIG_HEADERS="cctk_config.h"
EOF
cat >> $CONFIG_STATUS <<\EOF
fi
diff --git a/lib/make/configure.in b/lib/make/configure.in
index ab23f0cf..5b1f183b 100644
--- a/lib/make/configure.in
+++ b/lib/make/configure.in
@@ -17,7 +17,7 @@ AC_PREREQ(2.13)
dnl Starts here
AC_INIT()
-AC_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADER(cctk_config.h)
dnl Check the system type
AC_CANONICAL_SYSTEM