Changeset 638b6a in git

Timestamp:

Mar 15, 2004, 2:36:29 PM (20 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

a5e67fb1d8c3b440c5911cc422d60e30701248ab

Parents:

a880e537d54d933abe28e817d141a624a3dd2fce

Message:

*hannes: --with-malloc_h


git-svn-id: file:///usr/local/Singular/svn/trunk@7083 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

MP

Files:

• configure (modified) (5 diffs)
• configure.in (modified) (1 diff)

MP/configure

@@ -64 +64 @@
 ac_help="$ac_help
 \
-  --with-malloc=HEADER     use external malloc routines declared in HEADER"
+  --with-malloc_h=HEADER     use external malloc routines declared in HEADER"
 
 # Initialize some variables set by options.
@@ -3775 +3775 @@
 
 
-# Check whether --with-malloc or --without-malloc was given.
-if test "${with_malloc+set}" = set; then
-  withval="$with_malloc"
-  :
-fi
-
-
-if test "${with_malloc+set}" = set; then
-  ac_safe=`echo "${with_malloc}" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for ${with_malloc}""... $ac_c" 1>&6
-echo "configure:3788: checking for ${with_malloc}" >&5
+# Check whether --with-malloc_h or --without-malloc_h was given.
+if test "${with_malloc_h+set}" = set; then
+  withval="$with_malloc_h"
+  :
+fi
+
+
+if test "${with_malloc_h+set}" = set; then
+  ac_safe=`echo "${with_malloc_h}" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for ${with_malloc_h}""... $ac_c" 1>&6
+echo "configure:3788: checking for ${with_malloc_h}" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3792 +3792 @@
 #line 3793 "configure"
 #include "confdefs.h"
-#include <${with_malloc}>
+#include <${with_malloc_h}>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
@@ -3820 +3820 @@
 echo $ac_n "checking where malloc rotuines come from""... $ac_c" 1>&6
 echo "configure:3822: checking where malloc rotuines come from" >&5
-if test "${with_malloc+set}" = set; then
-  echo "$ac_t""${with_malloc}" 1>&6
+if test "${with_malloc_h+set}" = set; then
+  echo "$ac_t""${with_malloc_h}" 1>&6
   cat >> confdefs.h <<\EOF
 #define WITH_EXTERNAL_MALLOC 1
@@ -3827 +3827 @@
 
   cat >> confdefs.h <<EOF
-#define EXTERNAL_MALLOC_H "${with_malloc}"
+#define EXTERNAL_MALLOC_H "${with_malloc_h}"
 EOF
 

MP/configure.in

@@ -477 +477 @@
 
 dnl Check for external memory managements
-AC_ARG_WITH(malloc, \
- [ --with-malloc=HEADER     use external malloc routines declared in HEADER])
-
-if test "${with_malloc+set}" = set; then
-  AC_CHECK_HEADER(${with_malloc},,with_malloc=)
+AC_ARG_WITH(malloc_h, \
+ [ --with-malloc_h=HEADER     use external malloc routines declared in HEADER])
+
+if test "${with_malloc_h+set}" = set; then
+  AC_CHECK_HEADER(${with_malloc_h},,with_malloc=)
 fi
 AC_MSG_CHECKING(where malloc rotuines come from)
-if test "${with_malloc+set}" = set; then
-  AC_MSG_RESULT(${with_malloc})
+if test "${with_malloc_h+set}" = set; then
+  AC_MSG_RESULT(${with_malloc_h})
   AC_DEFINE(WITH_EXTERNAL_MALLOC)
-  AC_DEFINE_UNQUOTED(EXTERNAL_MALLOC_H, "${with_malloc}")
+  AC_DEFINE_UNQUOTED(EXTERNAL_MALLOC_H, "${with_malloc_h}")
 else
   AC_MSG_RESULT(stdlib.h)