pike.git/ src/ configure.in

Branch: Tag:

2005-06-17

2005-06-17 15:50:41 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Bundle reconfiguration now utilizes RECONFIGURE_BUNDLES mode.
This should speed up bundle reconfiguration considerably.
Disabled #line warning on AIX 5L/ia64.

Rev: src/configure.in:1.899

1: - AC_REVISION("$Id: configure.in,v 1.898 2005/06/15 12:41:14 grubba Exp $") + AC_REVISION("$Id: configure.in,v 1.899 2005/06/17 15:50:41 grubba Exp $")   AC_INIT(interpret.c)   AC_CONFIG_HEADER(machine.h)   
493:    fi   fi    + extra_abi_dirs="" + if type isainfo 2>/dev/null >/dev/null; then +  # Solaris +  # Some installations lack the symlink 64 -> amd64 or sparcv9, +  # or the corresponding 32 link. +  extra_abi_dirs=`isainfo -v 2>/dev/null|awk "/$with_abi"'-bit/ { print $2 }'` +  if test "x$extra_abi_dirs" = "x"; then :; else +  extra_abi_dirs="/$extra_abi_dirs" +  fi + fi +    echo   echo "Using ABI $with_abi."   echo
1437:   if test -d bundles/.; then    touch bundles/no_testsuites    pike_bundle_prefix="`pwd`/bundles" -  LDFLAGS="$LDFLAGS -L$pike_bundle_prefix/lib" +  test -d bundles/include/. || mkdir bundles/include    CPPFLAGS="$CPPFLAGS -I$pike_bundle_prefix/include" -  +  test -d bundles/lib/. || mkdir bundles/lib +  for d in "$with_abi" "/$with_abi" $extra_abi_dirs ""; do +  test -d "bundles/lib$d/." || mkdir "bundles/lib$d" +  LDFLAGS="$LDFLAGS -L$pike_bundle_prefix/lib$d" +  done   fi   export pike_bundle_dir   AC_ARG_WITH(site-prefixes,
2156:    ])    # 1506-010 (W) Macro XX invoked with a null argument for parameter Z.    AC_SYS_COMPILER_FLAG_QSUPPRESS(1506-010) +  # 1506-219 (W) #line value 40140 too large. +  AC_SYS_COMPILER_FLAG_QSUPPRESS(1506-219)       # Tell the linker to generate a large toc if needed    #
2351:    # MinGW system.    cat <<\EOF   #!/bin/sh - # Automatically generated by $Id: configure.in,v 1.898 2005/06/15 12:41:14 grubba Exp $. + # Automatically generated by $Id: configure.in,v 1.899 2005/06/17 15:50:41 grubba Exp $.   # MinGW-version. Do NOT edit.   posix_name="`cat`"   posix_prefix="/"
2389:    # Native POSIX system.    cat <<\EOF   #!/bin/sh - # Automatically generated by $Id: configure.in,v 1.898 2005/06/15 12:41:14 grubba Exp $. + # Automatically generated by $Id: configure.in,v 1.899 2005/06/17 15:50:41 grubba Exp $.   # POSIX-version. Do NOT edit.   cat   EOF
2398:    # rntcl-style    cat <<\EOF   #!/bin/sh - # Automatically generated by $Id: configure.in,v 1.898 2005/06/15 12:41:14 grubba Exp $. + # Automatically generated by $Id: configure.in,v 1.899 2005/06/17 15:50:41 grubba Exp $.   # RNTCL-version. Do NOT edit.   sed -e "$PIKE_PATH_TRANSLATE"   EOF
2420:      if test x$"pike_cv_sys_os" != xWindows_NT ; then    - extra_abi_dirs="" - if type isainfo 2>/dev/null >/dev/null; then -  # Solaris -  # Some installations lack the symlink 64 -> amd64 or sparcv9, -  # or the corresponding 32 link. -  extra_abi_dirs=`isainfo -v 2>/dev/null|awk "/$with_abi"'-bit/ { print $2 }'` -  if test "x$extra_abi_dirs" = "x"; then :; else -  extra_abi_dirs="/$extra_abi_dirs" -  fi - fi -  +    echo Searching for library and include directories...      #Don't add include dirs if they give us warnings...
7754:      AC_CONFIG_SUBDIRS(modules post_modules)    - AC_SUBST_FILE(dependencies) - dependencies=$srcdir/dependencies + subdirs_done=""    - AC_SUBST(YACC) - AC_SUBST(INSTALL) - AC_SUBST(ac_configure_args) + until test "x$subdirs_done" = "xyes"; do    - AC_SUBST(dmmsrc) +  _AC_OUTPUT_SUBDIRS    - common_module_makefile=modules/common_module_makefile - AC_SUBST_FILE(common_module_makefile) +  subdirs_done="yes"    - AC_OUTPUT(Makefile \ -  modules/common_module_makefile \ -  modules/static_module_makefile \ -  post_modules/static_module_makefile:modules/static_module_makefile.in \ -  modules/dynamic_module_makefile:$dmmsrc \ -  post_modules/dynamic_module_makefile:$dmmsrc \ -  precompile.sh specs, [ -  echo foo >stamp-h -  chmod +x precompile.sh -  ]) -  +    # Check if we have to enable some bundles   if test "$pike_bundle_dir" = ""; then :; else    bundle_info="`find . -type f -name '*.bundle'`"
7795:    # FIXME: Intra-bundle dependencies?    for bundle in $bundles; do    AC_MSG_CHECKING(for bundle $bundle) -  for dist_file in `cd "$pike_bundle_dir" && echo ${bundle}*.tar.gz` no; do +  for dist_file in `cd "$pike_bundle_dir" && echo ${bundle}*.tar.gz` \ +  no; do    if test -f "$pike_bundle_dir/$dist_file"; then    dist_file="$pike_bundle_dir/$dist_file"    break
7981:    cat <<EOF       - Rerunning configure with the bundles `echo $bundles` enabled. + Rerunning halted configures with the bundles `echo $bundles` enabled.         EOF -  # Restore CFLAGS, CPPFLAGS and LDFLAGS to what they were -  # when configure was started. -  if test "$cflags_is_set" = "no"; then -  unset CFLAGS -  else -  CFLAGS="${initial_cflags}" -  export CFLAGS +  +  # Inform the sub-configures that only the modules that requested +  # bundles to be enabled need to be reconfigured. +  +  RECONFIGURE_BUNDLES="yes" +  export RECONFIGURE_BUNDLES +  +  subdirs_done=""    fi -  if test "$cppflags_is_set" = "no"; then -  unset CPPFLAGS -  else -  CPPFLAGS="${initial_cppflags}" -  export CPPFLAGS +     fi -  if test "$ldflags_is_set" = "no"; then -  unset LDFLAGS -  else -  LDFLAGS="${initial_ldflags}" -  export LDFLAGS -  fi -  echo ${CONFIG_SHELL-/bin/sh} "$srcdir/configure" $ac_configure_args --without-bundles -  eval exec ${CONFIG_SHELL-/bin/sh} "$srcdir/configure" $ac_configure_args --without-bundles -  exit 17 -  fi - fi + done    -  + AC_SUBST_FILE(dependencies) + dependencies=$srcdir/dependencies +  + AC_SUBST(YACC) + AC_SUBST(INSTALL) + AC_SUBST(ac_configure_args) +  + AC_SUBST(dmmsrc) +  + common_module_makefile=modules/common_module_makefile + AC_SUBST_FILE(common_module_makefile) +  + AC_OUTPUT(Makefile \ +  modules/common_module_makefile \ +  modules/static_module_makefile \ +  post_modules/static_module_makefile:modules/static_module_makefile.in \ +  modules/dynamic_module_makefile:$dmmsrc \ +  post_modules/dynamic_module_makefile:$dmmsrc \ +  precompile.sh specs, [ +  echo foo >stamp-h +  chmod +x precompile.sh +  ]) +    # NOTE: M4 uses [] as quotes.      PIKE_VERSION="`sed -n -e 's/^.*PIKE_MAJOR_VERSION[[ \t]]*\([[^ \t]]*\)/\1/p' <$srcdir/version.h`.`sed -n -e 's/^.*PIKE_MINOR_VERSION[[ \t]]*\([[^ \t]]*\)/\1/p' <$srcdir/version.h`.`sed -n -e 's/^.*PIKE_BUILD_VERSION[[ \t]]*\([[^ \t]]*\)/\1/p' <$srcdir/version.h`"