Changeset 99be05 in git

Timestamp:

Jun 4, 1997, 9:44:21 PM (26 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', '91e5db82acc17434e4062bcfa44e6efa7d41fd30')

Children:

4c001aeab70ceba5cf5bfcdef42079b63fe8bc72

Parents:

d93b4897a51e395af3ce95f29a5b7731e26dd3ac

Message:

* merged fixes from 1-0 branch


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

Location:

libfac

Files:

• ChangeLog (modified) (1 diff)
• configure (modified) (9 diffs)
• configure.in (modified) (2 diffs)

libfac/ChangeLog

@@ -3 +3 @@
         * Makefile.in (uninstall): took out template installation
         (all): added OPTOBJ target so that the dir is created, if necessary
+
+Sun May 25 14:06:12 1997  Olaf Bachmann  <obachman@ratchwum.mathematik.uni-kl.de (Olaf Bachmann)>
+
+        * configure.in: Fixed handling of CXXFLAGS -- it is not touched if
+          set as env var
+
+Fri May 23 11:10:18 1997  Olaf Bachmann  <obachman@schlupp.mathematik.uni-kl.de (Olaf Bachmann)>
+
+        * configure.in (CXXFLAGS): Check whether they are set before value
+          is assigned 
 
 Tue May 13 20:09:03 1997  Olaf Bachmann  <obachman@schlupp.mathematik.uni-kl.de (Olaf Bachmann)>

libfac/configure

@@ -580 +580 @@
 
 if test "${CXXFLAGS+set}" != set; then
+  ac_cxxflags_set=no
   if test "$with_debug" = yes; then
     CXXFLAGS="-g"
@@ -641 +642 @@
 #endif
 EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:644: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:645: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gxx=yes
 else
@@ -690 +691 @@
   CXXCPP="${CXX-g++} -E"
   cat > conftest.$ac_ext <<EOF
-#line 693 "configure"
+#line 694 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:698: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:699: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
@@ -805 +806 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 808 "configure"
+#line 809 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:813: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:814: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
@@ -850 +851 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 853 "configure"
+#line 854 "configure"
 #include "confdefs.h"
 
@@ -900 +901 @@
 ; return 0; }
 EOF
-if { (eval echo configure:903: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:904: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
@@ -926 +927 @@
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 929 "configure"
+#line 930 "configure"
 #include "confdefs.h"
 
@@ -934 +935 @@
 ; return 0; }
 EOF
-if { (eval echo configure:937: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:938: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
@@ -959 +960 @@
 
 if test ${GXX} = yes; then
-  if test "${CXXFLAGS+set}" != set; then
+  if test "$ac_cxxflags_set" = no; then
     if test "$with_debug" = yes; then
       CXXFLAGS="-O -g"

libfac/configure.in

@@ -67 +67 @@
 
 if test "${CXXFLAGS+set}" != set; then
+  ac_cxxflags_set=no
   if test "$with_debug" = yes; then
     CXXFLAGS="-g"
@@ -117 +118 @@
 dnl
 if test ${GXX} = yes; then
-  if test "${CXXFLAGS+set}" != set; then
+  if test "$ac_cxxflags_set" = no; then
     if test "$with_debug" = yes; then
       CXXFLAGS="-O -g"