Branch: Tag:

2006-08-03

2006-08-03 15:28:47 by Martin Stjernholm <mast@lysator.liu.se>

Added support to bundle the dynamic Visual Studio crt in the install
packages.

Rev: src/Makefile.in:1.444
Rev: src/configure.in:1.980

1: - AC_REVISION("$Id: configure.in,v 1.979 2006/08/03 11:56:26 mast Exp $") + AC_REVISION("$Id: configure.in,v 1.980 2006/08/03 15:28:47 mast Exp $")   AC_INIT(interpret.c)   AC_CONFIG_HEADER(machine.h)   
1257:   AC_ARG_ENABLE(dll, MY_DESCR([--enable-dll],    [link dynamic modules to DLLs on Windows]),    [], [enable_dll=no]) + AC_ARG_WITH(crt, MY_DESCR([--with-crt=dynamic|static], +  [force linking with dynamic or static CRT in Visual Studio]))   AC_ARG_WITH(bundles,    MY_DESCR([--without-bundles],    [do not enable bundled libraries]),
2265:    # MinGW system.    cat <<\EOF   #!/bin/sh - # Automatically generated by $Id: configure.in,v 1.979 2006/08/03 11:56:26 mast Exp $. + # Automatically generated by $Id: configure.in,v 1.980 2006/08/03 15:28:47 mast Exp $.   # MinGW-version. Do NOT edit.   posix_name="`cat`"   posix_prefix="/"
2303:    # Native POSIX system.    cat <<\EOF   #!/bin/sh - # Automatically generated by $Id: configure.in,v 1.979 2006/08/03 11:56:26 mast Exp $. + # Automatically generated by $Id: configure.in,v 1.980 2006/08/03 15:28:47 mast Exp $.   # POSIX-version. Do NOT edit.   cat   EOF
2312:    # rntcl-style    cat <<\EOF   #!/bin/sh - # Automatically generated by $Id: configure.in,v 1.979 2006/08/03 11:56:26 mast Exp $. + # Automatically generated by $Id: configure.in,v 1.980 2006/08/03 15:28:47 mast Exp $.   # RNTCL-version. Do NOT edit.   sed -e "$PIKE_PATH_TRANSLATE"   EOF
7414:    fi   fi    + crt_type=static +    if test x$with_dynamic_modules = xyes \    -a x$enable_dll = xyes \    -a "x$pike_cv_sys_os" = xWindows_NT ; then    # If dlls are enabled then compile for and link with the dynamic crt    # to make all modules share the same crt instance. -  CFLAGS="$CFLAGS $dynamic_crt_flag" +  crt_type=dynamic    AC_DEFINE(USE_DLL) - elif test "x$static_crt_flag" != x; then + fi +  + # Let the --with-crt argument override the chosen crt linkage. + test x"$with_crt" != x && crt_type="$with_crt" +  + INSTALL_EXPORT_ARGS= +  + if test x"$crt_type" = xdynamic; then +  CFLAGS="$CFLAGS $dynamic_crt_flag" +  if test x$with_debug_crt = xyes; then +  INSTALL_EXPORT_ARGS="${INSTALL_EXPORT_ARGS} --debug-crt" +  else +  INSTALL_EXPORT_ARGS="${INSTALL_EXPORT_ARGS} --release-crt" +  fi + elif test x"$crt_type" = xstatic; then    CFLAGS="$CFLAGS $static_crt_flag" -  + else +  AC_MSG_ERROR([Pass either "static" or "dynamic" to --with-crt])   fi    -  + AC_SUBST(INSTALL_EXPORT_ARGS) +    # In case the normal libz is linked to the dynamic crt we need to use   # a different one linked with the static crt for the exe installer. We   # check if there is such a thing in the build environment with the