Changeset d695be in git


Ignore:
Timestamp:
May 23, 1997, 11:11:20 AM (26 years ago)
Author:
Olaf Bachmann <obachman@…>
Branches:
(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')
Children:
5b6c3122b40fc4de7e64d746da3d95e818170166
Parents:
30acf1687e42365e829aab1dac6dca1fe7e85058
Message:
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


git-svn-id: file:///usr/local/Singular/svn/trunk@319 2c84dea3-7e68-4137-9b89-c4e89433aadc
Location:
libfac
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • libfac/configure

    r30acf16 rd695be  
    579579LDFLAGS="-L. ${LDFLAGS}"
    580580
    581 if test "$with_debug" = yes; then
    582   CXXFLAGS="-g"
    583 else
    584   CXXFLAGS="-O"
    585   cat >> confdefs.h <<\EOF
     581if test "${CXXFLAGS+set}" != set; then
     582  if test "$with_debug" = yes; then
     583    CXXFLAGS="-g"
     584  else
     585    CXXFLAGS="-O"
     586    cat >> confdefs.h <<\EOF
    586587#define NDEBUG 1
    587588EOF
    588589 
    589 fi
     590  fi
     591fi
     592
    590593
    591594ac_ext=C
    … …  
    638641#endif
    639642EOF
    640 if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:641: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
     643if { 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
    641644  ac_cv_prog_gxx=yes
    642645else
    … …  
    687690  CXXCPP="${CXX-g++} -E"
    688691  cat > conftest.$ac_ext <<EOF
    689 #line 690 "configure"
     692#line 693 "configure"
    690693#include "confdefs.h"
    691694#include <stdlib.h>
    692695EOF
    693696ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    694 { (eval echo configure:695: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     697{ (eval echo configure:698: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    695698ac_err=`grep -v '^ *+' conftest.out`
    696699if test -z "$ac_err"; then
    … …  
    802805else
    803806  cat > conftest.$ac_ext <<EOF
    804 #line 805 "configure"
     807#line 808 "configure"
    805808#include "confdefs.h"
    806809#include <$ac_hdr>
    807810EOF
    808811ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    809 { (eval echo configure:810: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     812{ (eval echo configure:813: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    810813ac_err=`grep -v '^ *+' conftest.out`
    811814if test -z "$ac_err"; then
    … …  
    847850else
    848851  cat > conftest.$ac_ext <<EOF
    849 #line 850 "configure"
     852#line 853 "configure"
    850853#include "confdefs.h"
    851854
    … …  
    897900; return 0; }
    898901EOF
    899 if { (eval echo configure:900: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     902if { (eval echo configure:903: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    900903  rm -rf conftest*
    901904  ac_cv_c_const=yes
    … …  
    923926for ac_kw in inline __inline__ __inline; do
    924927  cat > conftest.$ac_ext <<EOF
    925 #line 926 "configure"
     928#line 929 "configure"
    926929#include "confdefs.h"
    927930
    … …  
    931934; return 0; }
    932935EOF
    933 if { (eval echo configure:934: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     936if { (eval echo configure:937: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    934937  rm -rf conftest*
    935938  ac_cv_c_inline=$ac_kw; break
    … …  
    956959
    957960if test ${GXX} = yes; then
    958   if test "$with_debug" = yes; then
    959      CXXFLAGS="-O -g"
    960   else
    961      CXXFLAGS="-O3 "
     961  if test "${CXXFLAGS+set}" != set; then
     962    if test "$with_debug" = yes; then
     963      CXXFLAGS="-O -g"
     964    else
     965      CXXFLAGS="-O3 "
     966    fi
    962967  fi
    963968  CXXTEMPLFLAGS="-fno-implicit-templates"

  • libfac/configure.in

    r30acf16 rd695be  
    6666LDFLAGS="-L. ${LDFLAGS}"
    6767
    68 if test "$with_debug" = yes; then
    69   CXXFLAGS="-g"
    70 else
    71   CXXFLAGS="-O"
    72   AC_DEFINE(NDEBUG) 
     68if test "${CXXFLAGS+set}" != set; then
     69  if test "$with_debug" = yes; then
     70    CXXFLAGS="-g"
     71  else
     72    CXXFLAGS="-O"
     73    AC_DEFINE(NDEBUG) 
     74  fi
    7375fi
     76
    7477
    7578dnl
    … …  
    114117dnl
    115118if test ${GXX} = yes; then
    116   if test "$with_debug" = yes; then
    117      CXXFLAGS="-O -g"
    118   else
    119      CXXFLAGS="-O3 "
     119  if test "${CXXFLAGS+set}" != set; then
     120    if test "$with_debug" = yes; then
     121      CXXFLAGS="-O -g"
     122    else
     123      CXXFLAGS="-O3 "
     124    fi
    120125  fi
    121126  CXXTEMPLFLAGS="-fno-implicit-templates"
Note: See TracChangeset for help on using the changeset viewer.