Changeset 05c6849 in git

Timestamp:

Feb 5, 2008, 5:53:35 PM (15 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '91fdef05f09f54b8d58d92a472e9c4a43aa4656f')

Children:

d4eb3f399315195558f76dcdfc526c8c3dd47917

Parents:

8373a71d6a2983af32cc5cf5277712fe65db7b37

Message:

*hannes: GLIBC_DYN_FIX


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

Location:

Singular

Files:

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

Singular/configure

@@ -5096 +5096 @@
 
 SAVE_LIBS=$LIBS
-echo $ac_n "checking for  in -lc_nonshared""... $ac_c" 1>&6
-echo "configure:5100: checking for  in -lc_nonshared" >&5
-ac_lib_var=`echo c_nonshared'_' | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for printf in -lc_nonshared""... $ac_c" 1>&6
+echo "configure:5100: checking for printf in -lc_nonshared" >&5
+ac_lib_var=`echo c_nonshared'_'printf | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5110 +5110 @@
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
-char ();
+char printf();
 
 int main() {
-()
+printf()
 ; return 0; }
 EOF
@@ -5131 +5131 @@
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-    ac_tr_lib=HAVE_LIB`echo c_nonshared | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
-  LIBS="-lc_nonshared $LIBS"
-
-else
-  echo "$ac_t""no" 1>&6
+  GLIBC_DYN_FIX="-lc_nonshared"
+else
+  echo "$ac_t""no" 1>&6
+GLIBC_DYN_FIX=""
 fi
 
 LIBS=$SAVE_LIBS
-if test "$ac_cv_lib_c_nonshared" = yes; then
-GLIBC_DYN_FIX="-lc_nonshared"
-else
-GLIBC_DYN_FIX=""
-fi
 
 
@@ -5157 +5146 @@
 
 echo $ac_n "checking which apint package to use""... $ac_c" 1>&6
-echo "configure:5160: checking which apint package to use" >&5
+echo "configure:5149: checking which apint package to use" >&5
 if test "${with_apint}" != gmp; then
   if test "$ac_gmp_ok" = yes || test "$enable_gmp" = yes; then
@@ -5180 +5169 @@
 #
 echo $ac_n "checking whether to have MP""... $ac_c" 1>&6
-echo "configure:5183: checking whether to have MP" >&5
+echo "configure:5172: checking whether to have MP" >&5
 if test "${with_MP}" != yes && test "${with_MP}" != no; then
   if (test "${will_have_gmp}" = yes) && \
@@ -5215 +5204 @@
 
 echo $ac_n "checking whether to have NTL""... $ac_c" 1>&6
-echo "configure:5218: checking whether to have NTL" >&5
+echo "configure:5207: checking whether to have NTL" >&5
 if test "${with_NTL}" = yes ; then
   echo "$ac_t""yes" 1>&6
@@ -5224 +5213 @@
 
 echo $ac_n "checking whether to have factory""... $ac_c" 1>&6
-echo "configure:5227: checking whether to have factory" >&5
+echo "configure:5216: checking whether to have factory" >&5
 if test "${with_factory}" != yes && test "${with_factory}" != no; then
   if test "$ac_factory_ok" =  yes || test "$enable_factory" = yes; then
@@ -5255 +5244 @@
 
 echo $ac_n "checking whether to have libfac""... $ac_c" 1>&6
-echo "configure:5258: checking whether to have libfac" >&5
+echo "configure:5247: checking whether to have libfac" >&5
 if test "${with_libfac}" != yes && test "${with_libfac}" != no; then
   if (test "${will_have_factory}" = yes) && \
@@ -5297 +5286 @@
 
 echo $ac_n "checking whether to have dbm links""... $ac_c" 1>&6
-echo "configure:5300: checking whether to have dbm links" >&5
+echo "configure:5289: checking whether to have dbm links" >&5
 if test "$with_dbm" != no; then
   cat >> confdefs.h <<\EOF
@@ -5309 +5298 @@
 
 echo $ac_n "checking whether to have namespaces""... $ac_c" 1>&6
-echo "configure:5312: checking whether to have namespaces" >&5
+echo "configure:5301: checking whether to have namespaces" >&5
 if test "$with_namespaces" != no; then
   echo "$ac_t""yes" 1>&6
@@ -5321 +5310 @@
 
 echo $ac_n "checking whether to have dynamic modules""... $ac_c" 1>&6
-echo "configure:5324: checking whether to have dynamic modules" >&5
+echo "configure:5313: checking whether to have dynamic modules" >&5
 if test "$with_dynamic_modules" = no || test "$ac_have_dl" != yes; then
   echo "$ac_t""no" 1>&6
@@ -5333 +5322 @@
 
 echo $ac_n "checking whether to have dynamic kernel""... $ac_c" 1>&6
-echo "configure:5336: checking whether to have dynamic kernel" >&5
+echo "configure:5325: checking whether to have dynamic kernel" >&5
 if test "$with_dynamic_kernel" != no && test "$ac_lib_dl" = yes; then
   DL_KERNEL=1
@@ -5343 +5332 @@
 
 echo $ac_n "checking whether to have Plural""... $ac_c" 1>&6
-echo "configure:5346: checking whether to have Plural" >&5
+echo "configure:5335: checking whether to have Plural" >&5
 if test "$with_Plural" != no && test "$enable_Plural" != no; then
   cat >> confdefs.h <<\EOF

Singular/configure.in

@@ -772 +772 @@
 
 SAVE_LIBS=$LIBS
-AC_CHECK_LIB(c_nonshared)
+AC_CHECK_LIB(c_nonshared,printf,GLIBC_DYN_FIX="-lc_nonshared",GLIBC_DYN_FIX="")
 LIBS=$SAVE_LIBS
-if test "$ac_cv_lib_c_nonshared" = yes; then
-GLIBC_DYN_FIX="-lc_nonshared"
-else
-GLIBC_DYN_FIX=""
-fi
 AC_SUBST(GLIBC_DYN_FIX)