Branch: Tag:

2002-12-10

2002-12-10 10:20:41 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Removed need for cflags_make_conf kludge.

Rev: src/configure.in:1.656

1: - AC_REVISION("$Id: configure.in,v 1.655 2002/12/10 07:33:58 mirar Exp $") + AC_REVISION("$Id: configure.in,v 1.656 2002/12/10 10:20:41 grubba Exp $")   AC_INIT(interpret.c)   AC_CONFIG_HEADER(machine.h)   
52:    [do not use settings from /etc/make.conf]),    [], [enable_make_conf=yes])    - if test "x$enable_make_conf" = x"yes" -a -f /etc/make.conf; then -  set >conftest.tmp -  echo Using settings from /etc/make.conf... -  source /etc/make.conf -  set | diff -u conftest.tmp - | grep '^+C' -  cflags_make_conf=yes - else -  cflags_make_conf=no - fi -  -  +    if test "x${CFLAGS-}" = x ; then    cflags_is_set=no   else
81:    ldflags_is_set=yes   fi    + if test "x$enable_make_conf" = x"yes" -a -f /etc/make.conf; then +  set >conftest.tmp +  echo Using settings from /etc/make.conf... +  source /etc/make.conf +  set | diff -u conftest.tmp - | grep '^+C' + fi +    AC_ARG_WITH(cflags, MY_DESCR([--with-cflags=cflags],    [specify extra c compiler flags]),    [ CFLAGS="$with_cflags $CFLAGS" ])
1441:   OPTIMIZE="${OPTFLAGS-}"      AC_ARG_ENABLE(pedantic, MY_DESCR([--enable-pedantic], -  [enable -pedantic compilation]), -  [enable_make_conf=yes], []) +  [enable -pedantic compilation]))    - if test "$cflags_is_set" = "no" -o "$cflags_make_conf" = "yes"; then + if test "$cflags_is_set" = "no"; then    if test "x$with_cdebug" = "xno" ; then    CFLAGS=`echo " $CFLAGS " | sed -e 's@ -g @ @g'`    else
1492:    #else    # :    #fi -  fi - fi +     - if test "$cflags_is_set" = "no"; then -  if test "x${GCC-}" = xyes ; then -  +    ### Optimize for different SUN machines. If there is no working 'uname'   ### no extra optimization will be done, but nothing should break either.    case "`uname -m 2>/dev/null`" in
6177:   shared object... .$SO   libs............ $LIBS   cross-compiled.. $cross_compiling - CFLAGS (cpp).... -I. -I$srcdir $CPPFLAGS - CFLAGS (opt)....$OPTIMIZE - CFLAGS (warn)...$WARN - CFLAGS (misc)...$CFLAGS $OSFLAGS $PROFIL - LDFLAGS.........$LDFLAGS $LINKFORSHARED $EXTRALDFLAGS + CPPFLAGS........ $CPPFLAGS + CFLAGS (opt).... $OPTIMIZE + CFLAGS (warn)... $WARN + CFLAGS (misc)... $CFLAGS $OSFLAGS $PROFIL + LDFLAGS......... $LDFLAGS $LINKFORSHARED $EXTRALDFLAGS      features:   PAD_FEATURE([dynamic loading])$pike_cv_sys_dynamic_loading