Branch: Tag:

2002-01-27

2002-01-27 00:54:02 by Martin Stjernholm <mast@lysator.liu.se>

Various fixes to the source, depend and export targets: All automatically
generated files in the src tree (except some things in post_modules) are
really generated now. When --disable-binary is used, most configure tests
will fake success, so that make depend isn't short-circuited in modules that
can't be compiled on this machine. Also a little less noise in the depend
targets so that errors are easier to spot.

Rev: Makefile:1.51
Rev: bin/nobinary_dummy:1.1
Rev: src/Makefile.in:1.282
Rev: src/aclocal.m4:1.35
Rev: src/configure.in:1.563
Rev: src/make_variables.in:1.5
Rev: src/modules/Gmp/Makefile.in:1.22
Rev: src/modules/Gmp/configure.in:1.29
Rev: src/modules/Java/configure.in:1.28
Rev: src/modules/Oracle/configure.in:1.33
Rev: src/modules/Perl/configure.in:1.12
Rev: src/modules/_Crypto/lib/configure.in:1.13
Rev: src/modules/_Image_FreeType/configure.in:1.8
Rev: src/modules/_Image_XFace/configure.in:1.10
Rev: src/modules/dynamic_module_makefile.in:1.79
Rev: src/modules/files/configure.in:1.79
Rev: src/modules/static_module_makefile.in:1.70
Rev: src/post_modules/GTK/configure.in:1.35
Rev: src/post_modules/Unicode/Makefile.in:1.4

1: - AC_REVISION("$Id: configure.in,v 1.562 2001/12/10 02:08:13 mast Exp $") + AC_REVISION("$Id: configure.in,v 1.563 2002/01/27 00:53:59 mast Exp $")   AC_INIT(interpret.c)   AC_CONFIG_HEADER(machine.h)   
77:    [], [enable_binary=yes])      if test "x$enable_binary" = "xno"; then -  AC_MSG_WARN(Short-circuiting configure tests for binary building.) -  AC_MSG_WARN(Only some targets in the Makefile can be used.) -  CC=false -  CPP=echo +  AC_MSG_WARN([ +  + Short-circuiting configure tests for binary building. Only some + targets in the Makefile can be used, typically those that only + operates on the source directory, e.g. depend. +  + ])   else       if test ! -z "$pike_cv_prog_CC_save" -a ! -z "$CC" -a "$CC" != "$pike_cv_prog_CC_save"
91:       pike_cv_prog_CC_save="$CC"    + fi +  + # Do the below even when --disable-binary is used, since we need a + # real $CPP, and AC_PROG_CPP wants AC_PROG_CC to be called earlier. + # $CC will be overridden with a dummy later on. +     # MY_AC_PROG_CC    # The above has problems if the smartlink binary is removed. /grubba    AC_PROG_CC
98:      #############################################################################    + if test "x$enable_binary" != "xno"; then    AC_ISC_POSIX    AC_AIX    AC_MINIX -  +    fi      #############################################################################
282:      #############################################################################    + LIBDIR=`(cd $srcdir/../lib ; pwd)` + BINDIR=`(cd $srcdir/../bin ; pwd)` + BUILDDIR=`pwd` + AC_SUBST(LIBDIR) + AC_SUBST(BINDIR) + AC_SUBST(BUILDDIR) +  + ############################################################################# +    # - # Some cross-compilation support + # Some cross-compilation support and --disable-binary stuff   #    -  + if test "x$enable_binary" = "xno"; then +  CROSS=yes + else    CROSS="$ac_cv_prog_cc_cross" -  + fi   AC_SUBST(CROSS)    - if test "x$ac_cv_prog_cc_cross" = "xyes"; then + if test "x$enable_binary" = "xno"; then +  CC="$BINDIR/nobinary_dummy cc" +  RUNPIKE="USE_PIKE"    RUNTPIKE="USE_PIKE" -  + elif test "x$ac_cv_prog_cc_cross" = "xyes"; then +  RUNPIKE="DEFAULT_RUNPIKE" +  RUNTPIKE="USE_PIKE"   else -  +  RUNPIKE="DEFAULT_RUNPIKE"    RUNTPIKE="USE_TPIKE"   fi -  + AC_SUBST(RUNPIKE)   AC_SUBST(RUNTPIKE)    - AC_PATH_PROG(pike_prog,pike,no) - PIKE="$ac_cv_path_pike_prog" - AC_SUBST(PIKE) -  +    ############################################################################# -  - LIBDIR=`(cd $srcdir/../lib ; pwd)` - BINDIR=`(cd $srcdir/../bin ; pwd)` - BUILDDIR=`pwd` - AC_SUBST(LIBDIR) - AC_SUBST(BINDIR) - AC_SUBST(BUILDDIR) -  - ############################################################################# +    if test "x$enable_binary" != "xno"; then   # The following tests are only relevant if we intend to build binaries.   #############################################################################
1752:      AC_DEFINE(POSIX_SOURCE)    - if test "x$enable_binary" != "xno"; then -  +     AC_MSG_CHECKING(ansi prototype capability)    AC_CACHE_VAL(pike_cv_sys_ansi_prototypes,    [
1769:    exit 1    fi    - fi -  +    #############################################################################      # The AC_PROG_INSTALL test is broken if $INSTALL is specified by hand.
3276:   AC_MSG_CHECKING(byteorder)   AC_CACHE_VAL(pike_cv_hardware_byteorder,   [ + if test "x$enable_binary" = "xno"; then +  pike_cv_hardware_byteorder=0 + else   AC_TRY_RUN([   #include <stdio.h>   
3308:   pike_cv_hardware_byteorder=0   ,   pike_cv_hardware_byteorder=0 - )]) + ) + fi + ])      AC_MSG_RESULT($pike_cv_hardware_byteorder)   AC_DEFINE_UNQUOTED(PIKE_BYTEORDER,$pike_cv_hardware_byteorder)
3318:   AC_MSG_CHECKING(INT32 alignment)   AC_CACHE_VAL(pike_cv_hardware_alignment,   [ + if test "x$enable_binary" = "xno"; then +  pike_cv_hardware_alignment=4 + else   AC_TRY_RUN([   #include <stdio.h>   
3346:   pike_cv_hardware_alignment=`cat conftest.out.2`,   pike_cv_hardware_alignment=4,   pike_cv_hardware_alignment=4 - )]) + ) + fi + ])      AC_MSG_RESULT($pike_cv_hardware_alignment)   AC_DEFINE_UNQUOTED(PIKE_INT32_ALIGNMENT,$pike_cv_hardware_alignment)
4281:   AC_MSG_CHECKING(available file descriptors)   AC_CACHE_VAL(pike_cv_max_open_fd,   [ + if test "x$enable_binary" = "xno"; then +  pike_cv_max_open_fd=256 + else   AC_TRY_RUN([   #include <stdio.h>   #ifdef HAVE_SYS_TIME_H
4334:   pike_cv_max_open_fd=256   ,   pike_cv_max_open_fd=256 - )]) + ) + fi + ])   AC_MSG_RESULT($pike_cv_max_open_fd)   AC_DEFINE_UNQUOTED(MAX_OPEN_FILEDESCRIPTORS,$pike_cv_max_open_fd)   
4705:   ##########################################################################   AC_MSG_CHECKING(how well OOB handling works)   AC_CACHE_VAL(pike_cv_system_oob_working,[ + if test "x$enable_binary" = "xno"; then +  pike_cv_system_oob_working=WORKING + else    OCPPFLAGS="$CPPFLAGS"    CPPFLAGS="-I. -I../.. -I$srcdir -I$srcdir/../.."    AC_TRY_RUN([
5030:    CPPFLAGS="$OCPPFLAGS"       rm conftest.out.2 >/dev/null 2>/dev/null || : + fi   ])   AC_MSG_RESULT($pike_cv_system_oob_working)   
5750:   fi      ############################################################################# - if test "x$enable_binary" != "xno"; then - ############################################################################# +       if test x$with_dynamic_modules = xyes ; then    dmmsrc="modules/dynamic_module_makefile.in"
5762:      #############################################################################    + PMOD_TARGETS= + for f in $srcdir/*.cmod; do +  PMOD_TARGETS="$PMOD_TARGETS $f" + done + PMOD_TARGETS=`echo $srcdir/*.cmod | sed -e "s/\.cmod/\.c/g" | sed -e "s|$srcdir/|\\$(SRCDIR)/|g"` + AC_SUBST(PMOD_TARGETS) +  + ############################################################################# +    echo   echo "Compiler summary:"   echo   echo "C Compiler: $CC" -  + echo "Preprocessor: $CPP"   echo "Linker: $LD"   echo "Shared linker: $LDSHARED"   echo
5805:   pike_cv_prog_CC="${CC}"      ############################################################################# - else #if test "x$enable_binary" != "xno" -  dmmsrc="modules/static_module_makefile.in" - fi - ############################################################################# +       AC_CONFIG_SUBDIRS(modules post_modules)