Branch: Tag:

2006-07-05

2006-07-05 00:05:44 by Martin Stjernholm <mast@lysator.liu.se>

Fixes for dll linking.

Rev: src/Makefile.in:1.435
Rev: src/configure.in:1.970

1: - AC_REVISION("$Id: configure.in,v 1.969 2006/07/03 03:22:28 nilsson Exp $") + AC_REVISION("$Id: configure.in,v 1.970 2006/07/05 00:05:44 mast Exp $")   AC_INIT(interpret.c)   AC_CONFIG_HEADER(machine.h)   
2134:    ;;       *rntcl*) -  # If --with-rtldebug then compile for and link with the debug -  # runtime lib. If --enable-dll then compile for and link with -  # the dynamic crt to make all modules share the same crt -  # instance. +     if test x$with_rtldebug = xyes; then -  if test x$enable_dll = xyes; then -  CFLAGS="$CFLAGS -MDd" +  dynamic_crt_flag=-MDd +  static_crt_flag=-MTd    else -  CFLAGS="$CFLAGS -MTd" +  dynamic_crt_flag=-MD +  static_crt_flag=-MT    fi -  else -  if test x$enable_dll = xyes; then -  CFLAGS="$CFLAGS -MD" -  else -  CFLAGS="$CFLAGS -MT" -  fi -  fi +     ;;    esac   
2259:    # MinGW system.    cat <<\EOF   #!/bin/sh - # Automatically generated by $Id: configure.in,v 1.969 2006/07/03 03:22:28 nilsson Exp $. + # Automatically generated by $Id: configure.in,v 1.970 2006/07/05 00:05:44 mast Exp $.   # MinGW-version. Do NOT edit.   posix_name="`cat`"   posix_prefix="/"
2297:    # Native POSIX system.    cat <<\EOF   #!/bin/sh - # Automatically generated by $Id: configure.in,v 1.969 2006/07/03 03:22:28 nilsson Exp $. + # Automatically generated by $Id: configure.in,v 1.970 2006/07/05 00:05:44 mast Exp $.   # POSIX-version. Do NOT edit.   cat   EOF
2306:    # rntcl-style    cat <<\EOF   #!/bin/sh - # Automatically generated by $Id: configure.in,v 1.969 2006/07/03 03:22:28 nilsson Exp $. + # Automatically generated by $Id: configure.in,v 1.970 2006/07/05 00:05:44 mast Exp $.   # RNTCL-version. Do NOT edit.   sed -e "$PIKE_PATH_TRANSLATE"   EOF
7030:   # Set info about shared libraries.   AC_SUBST(SO)   AC_SUBST(LDSHARED) + AC_SUBST(LDSHARED_BASE_REQS)   AC_SUBST(LDSHARED_MODULE_REQS)   AC_SUBST(CCSHARED)   AC_SUBST(LINKFORSHARED)
7134:    # It's important that we use $(CC) unexpanded here so that any    # -MD/-MDd flags also gets passed to the linker.    LDSHARED='$(CC) -shared' -  LDSHARED_MODULE_ARGS="-l`pwd`/pike" -  LDSHARED_MODULE_REQS="`pwd`/pike.lib" +  LDSHARED_BASE_REQS=tpike.lib +  LDSHARED_MODULE_ARGS="-l`pwd`/tpike" +  LDSHARED_MODULE_REQS="`pwd`/tpike.lib"    fi    ;;    *) LDSHARED="ld";;
7395:    fi   fi    + 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" + elif test "x$static_crt_flag" != x; then +  CFLAGS="$CFLAGS $static_crt_flag" + fi +    #######################################################################   # Since configure doesn't always know if we will be linking with ld or cc,   # We use this little code snippet to add flags to ld that would otherwise