comparison configure @ 109421:10cf940285f9

Merge from mainline.

109420:c166807ffc89

LIBS_SYSTEM
C_SWITCH_SYSTEM
UNEXEC_OBJ
C_SWITCH_MACHINE
LD_SWITCH_SYSTEM
cannot_dump
MAKEINFO
GZIP_PROG
INSTALL_INFO
RANLIB
INSTALL_DATA

  test x$cc_specified != xyes
then
  CC="$NON_GNU_CC"
fi

if test x$GCC = xyes && test "x$GCC_TEST_OPTIONS" != x
then
  CC="$CC $GCC_TEST_OPTIONS"
fi

if test x$GCC = x && test "x$NON_GCC_TEST_OPTIONS" != x
then
  CC="$CC $NON_GCC_TEST_OPTIONS"
fi

ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'

$as_echo "no" >&6; }
fi
rm -f core conftest.err conftest.$ac_objext \
    conftest$ac_exeext conftest.$ac_ext

#### Extract some information from the operating system and machine files.

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the machine- and system-dependent files to find out
 - which libraries the lib-src programs will want, and
 - whether the GNU malloc routines are usable..." >&5
$as_echo "$as_me: checking the machine- and system-dependent files to find out
 - which libraries the lib-src programs will want, and
 - whether the GNU malloc routines are usable..." >&6;}

### First figure out CFLAGS (which we use for running the compiler here)
### and REAL_CFLAGS (which we use for real compilation).
### The two are the same except on a few systems, where they are made
### different to work around various lossages.  For example,
### GCC 2.5 on GNU/Linux needs them to be different because it treats -g
### as implying static linking.

### If the CFLAGS env var is specified, we use that value
### instead of the default.

### It's not important that this name contain the PID; you can't run
### two configures in the same directory and have anything work
### anyway.
tempcname="conftest.c"

echo '
#include "'${srcdir}'/src/'${opsysfile}'"
#include "'${srcdir}'/src/'${machfile}'"

configure___ LIBX=-lX11

#ifdef CANNOT_DUMP
configure___ cannot_dump=yes
#else
configure___ cannot_dump=no
#endif

#ifdef SYSTEM_MALLOC
configure___ system_malloc=yes
#else
configure___ system_malloc=no
#endif

#ifdef USE_MMAP_FOR_BUFFERS
configure___ use_mmap_for_buffers=yes
#else
configure___ use_mmap_for_buffers=no
#endif

#ifndef C_OPTIMIZE_SWITCH
#ifdef __GNUC__
#define C_OPTIMIZE_SWITCH -O2
#else
#define C_OPTIMIZE_SWITCH -O
#endif
#endif

#ifndef C_WARNINGS_SWITCH
#define C_WARNINGS_SWITCH ${C_WARNINGS_SWITCH}
#endif

#ifdef THIS_IS_CONFIGURE

/* Get the CFLAGS for tests in configure.  */
#ifdef __GNUC__
configure___ CFLAGS=-g C_OPTIMIZE_SWITCH '${SPECIFIED_CFLAGS}'
#else
configure___ CFLAGS='${SPECIFIED_CFLAGS}'
#endif

#else /* not THIS_IS_CONFIGURE */

/* Get the CFLAGS for real compilation.  */
#ifdef __GNUC__
configure___ REAL_CFLAGS=-g C_OPTIMIZE_SWITCH C_WARNINGS_SWITCH ${PROFILING_CFLAGS} '${SPECIFIED_CFLAGS}'
#else
configure___ REAL_CFLAGS='${SPECIFIED_CFLAGS}'
#endif

#endif /* not THIS_IS_CONFIGURE */
' > ${tempcname}

LDFLAGS="${LDFLAGS} ${PROFILING_LDFLAGS}"

# The value of CPP is a quoted variable reference, so we need to do this
# to get its actual value...
CPP=`eval "echo $CPP"`
eval `${CPP} -Isrc ${tempcname} \
       | sed -n -e 's/^configure___ \([^=]*=\)\(.*\)$/\1"\2"/p'`
if test "x$SPECIFIED_CFLAGS" = x; then
  eval `${CPP} -Isrc -DTHIS_IS_CONFIGURE ${tempcname} \
	 | sed -n -e 's/^configure___ \([^=]*=\)\(.*\)$/\1"\2"/p'`
else
  REAL_CFLAGS="$CFLAGS"
fi
rm ${tempcname}




UNEXEC_OBJ=unexelf.o
case "$opsys" in

eval as_val=\$$as_ac_Header
   if test "x$as_val" = x""yes; then :
  cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF

fi

done

  # Emulation library used on NetBSD.

    CFLAGS_SOUND="$CFLAGS_SOUND $ALSA_CFLAGS"

$as_echo "#define HAVE_ALSA 1" >>confdefs.h

  fi

fi

for ac_header in sys/select.h sys/timeb.h sys/time.h unistd.h utime.h \
  linux/version.h sys/systeminfo.h termios.h limits.h string.h stdlib.h \

$as_echo "$emacs_cv_var___after_morecore_hook" >&6; }
if test $emacs_cv_var___after_morecore_hook = no; then
  doug_lea_malloc=no
fi

if test "${system_malloc}" = "yes"; then
  GNU_MALLOC=no
  GNU_MALLOC_reason="
    (The GNU allocators don't work with this system configuration.)"
  GMALLOC_OBJ=
  VMLIMIT_OBJ=

if test x"${REL_ALLOC}" = x; then
  REL_ALLOC=${GNU_MALLOC}
fi





  for ac_header in $ac_header_list

fi
rm -f conftest.mmap conftest.txt

if test $use_mmap_for_buffers = yes; then
  REL_ALLOC=no
fi

LIBS="$LIBS_SYSTEM $LIBS"

REAL_CPPFLAGS="$CPPFLAGS"

if test "${HAVE_X11}" = "yes"; then
  DEFS="$C_SWITCH_X_SITE $DEFS"
  LDFLAGS="$LDFLAGS $LD_SWITCH_X_SITE"
  LIBS="$LIBX $LIBS"
  CFLAGS="$C_SWITCH_X_SITE $CFLAGS"
  CPPFLAGS="$C_SWITCH_X_SITE $CPPFLAGS"

  # On Solaris, arrange for LD_RUN_PATH to point to the X libraries for tests.
  # This is handled by LD_SWITCH_X_SITE_AUX during the real build,

    { $as_echo "$as_me:${as_lineno-$LINENO}: result: 6 or newer" >&5
$as_echo "6 or newer" >&6; }

$as_echo "#define HAVE_X11R6 1" >>confdefs.h

  else
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: before 6" >&5
$as_echo "before 6" >&6; }
  fi
fi

109421:10cf940285f9

LIBS_SYSTEM
C_SWITCH_SYSTEM
UNEXEC_OBJ
C_SWITCH_MACHINE
LD_SWITCH_SYSTEM
CANNOT_DUMP
MAKEINFO
GZIP_PROG
INSTALL_INFO
RANLIB
INSTALL_DATA

  test x$cc_specified != xyes
then
  CC="$NON_GNU_CC"
fi

if test x$GCC = xyes; then
  C_OPTIMIZE_SWITCH=-O2
  test "x$GCC_TEST_OPTIONS" != x && CC="$CC $GCC_TEST_OPTIONS"
else
    C_OPTIMIZE_SWITCH=-O
  test "x$NON_GCC_TEST_OPTIONS" != x && CC="$CC $NON_GCC_TEST_OPTIONS"
fi

ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'

$as_echo "no" >&6; }
fi
rm -f core conftest.err conftest.$ac_objext \
    conftest$ac_exeext conftest.$ac_ext

LDFLAGS="${LDFLAGS} ${PROFILING_LDFLAGS}"


# The value of CPP is a quoted variable reference, so we need to do this
# to get its actual value...
CPP=`eval "echo $CPP"`


### First figure out CFLAGS (which we use for running the compiler here)
### and REAL_CFLAGS (which we use for real compilation).
### The two are the same except when using GCC where we might use
### extra warning and profiling flags.

### If the CFLAGS env var is specified, we use that value
### instead of the default.

if test "x$SPECIFIED_CFLAGS" = x; then
  CFLAGS="-g $C_OPTIMIZE_SWITCH"
  if test x$GCC = xyes; then
    REAL_CFLAGS="$CFLAGS $C_WARNINGS_SWITCH $PROFILING_CFLAGS"
  else
    REAL_CFLAGS="$CFLAGS"
  fi
else
  REAL_CFLAGS="$CFLAGS"
fi


CANNOT_DUMP=no
case "$opsys" in
  your-opsys-here)
   CANNOT_DUMP=yes

$as_echo "#define CANNOT_DUMP 1" >>confdefs.h

  ;;
esac



UNEXEC_OBJ=unexelf.o
case "$opsys" in

eval as_val=\$$as_ac_Header
   if test "x$as_val" = x""yes; then :
  cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
 have_sound_header=yes
fi

done

  # Emulation library used on NetBSD.

    CFLAGS_SOUND="$CFLAGS_SOUND $ALSA_CFLAGS"

$as_echo "#define HAVE_ALSA 1" >>confdefs.h

  fi

        if test x$have_sound_header = xyes || test $HAVE_ALSA = yes; then
     case "$opsys" in
              gnu-linux|freebsd|netbsd)

$as_echo "#define HAVE_SOUND 1" >>confdefs.h

         ;;
     esac
  fi


fi

for ac_header in sys/select.h sys/timeb.h sys/time.h unistd.h utime.h \
  linux/version.h sys/systeminfo.h termios.h limits.h string.h stdlib.h \

$as_echo "$emacs_cv_var___after_morecore_hook" >&6; }
if test $emacs_cv_var___after_morecore_hook = no; then
  doug_lea_malloc=no
fi


system_malloc=no
case "$opsys" in
  ## darwin ld insists on the use of malloc routines in the System framework.
  darwin|sol2-10) system_malloc=yes ;;
esac

if test "${system_malloc}" = "yes"; then

$as_echo "#define SYSTEM_MALLOC 1" >>confdefs.h

  GNU_MALLOC=no
  GNU_MALLOC_reason="
    (The GNU allocators don't work with this system configuration.)"
  GMALLOC_OBJ=
  VMLIMIT_OBJ=

if test x"${REL_ALLOC}" = x; then
  REL_ALLOC=${GNU_MALLOC}
fi

use_mmap_for_buffers=no
case "$opsys" in
  freebsd|irix6-5) use_mmap_for_buffers=yes ;;
esac




  for ac_header in $ac_header_list

fi
rm -f conftest.mmap conftest.txt

if test $use_mmap_for_buffers = yes; then

$as_echo "#define USE_MMAP_FOR_BUFFERS 1" >>confdefs.h

  REL_ALLOC=no
fi

LIBS="$LIBS_SYSTEM $LIBS"

REAL_CPPFLAGS="$CPPFLAGS"

if test "${HAVE_X11}" = "yes"; then
  DEFS="$C_SWITCH_X_SITE $DEFS"
  LDFLAGS="$LDFLAGS $LD_SWITCH_X_SITE"
  LIBS="-lX11 $LIBS"
  CFLAGS="$C_SWITCH_X_SITE $CFLAGS"
  CPPFLAGS="$C_SWITCH_X_SITE $CPPFLAGS"

  # On Solaris, arrange for LD_RUN_PATH to point to the X libraries for tests.
  # This is handled by LD_SWITCH_X_SITE_AUX during the real build,

    { $as_echo "$as_me:${as_lineno-$LINENO}: result: 6 or newer" >&5
$as_echo "6 or newer" >&6; }

$as_echo "#define HAVE_X11R6 1" >>confdefs.h


$as_echo "#define HAVE_X_I18N 1" >>confdefs.h

    ## [e-mail] says Solaris has a bug related to X11R6-style
    ## XIM support.
    case "$opsys" in
      sol2-*) : ;;
      *)
$as_echo "#define HAVE_X11R6_XIM 1" >>confdefs.h

         ;;
    esac
  else
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: before 6" >&5
$as_echo "before 6" >&6; }
  fi
fi