Skip to content
This repository
Browse code

Fix configure script so that it correctly propagates the configure sc…

…ript options to the runtime system for display (gsi -v).
  • Loading branch information...
commit c5cd419d0f712cd88c5b624c8f96b12808be1262 1 parent 4404899
Marc Feeley authored
2  bin/gambc-cc.unix.in
@@ -183,7 +183,7 @@ case "$1" in
183 183 ;;
184 184
185 185 *)
186   - echo "gambc-cc.bat unknown operation \"$1\""
  186 + echo "gambc-cc unknown operation \"$1\""
187 187 exit 1
188 188 ;;
189 189
3  configure
@@ -1959,7 +1959,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
1959 1959 ac_config_headers="$ac_config_headers include/config.h"
1960 1960
1961 1961
1962   -CONFIGURE_COMMAND="$0 $@"
1963 1962 PACKAGE_SHORTNAME="gambc"
1964 1963
1965 1964
@@ -25989,7 +25988,7 @@ emacsdir="\${datadir}/emacs/site-lisp"
25989 25988 GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___SYS_TYPE_CPU=\"\\\"$target_cpu\\\"\""
25990 25989 GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___SYS_TYPE_VENDOR=\"\\\"$target_vendor\\\"\""
25991 25990 GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___SYS_TYPE_OS=\"\\\"$target_os\\\"\""
25992   -GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___CONFIGURE_COMMAND=\"\\\"$CONFIGURE_COMMAND\\\"\""
  25991 +GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___CONFIGURE_COMMAND=\"\\\"`echo "$0$ac_configure_args" | sed -e s/\\\\\\\\/\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\/g -e s/\\\\\\\"/\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"/g`\"\\\""
25993 25992 GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___OBJ_EXTENSION=\"\\\"$obj\\\"\""
25994 25993 GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___EXE_EXTENSION=\"\\\"$exe\\\"\""
25995 25994 GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___BAT_EXTENSION=\"\\\"$bat\\\"\""
3  configure.ac
@@ -8,7 +8,6 @@ AC_INIT(Gambit-C,v4.6.3,gambit@iro.umontreal.ca,gambc-v4_6_3)
8 8
9 9 AC_CONFIG_HEADERS(include/config.h)
10 10
11   -CONFIGURE_COMMAND="$0 $@"
12 11 PACKAGE_SHORTNAME="gambc"
13 12
14 13 AC_SUBST(PACKAGE_SHORTNAME)
@@ -1823,7 +1822,7 @@ emacsdir="\${datadir}/emacs/site-lisp"
1823 1822 GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___SYS_TYPE_CPU=\"\\\"$target_cpu\\\"\""
1824 1823 GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___SYS_TYPE_VENDOR=\"\\\"$target_vendor\\\"\""
1825 1824 GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___SYS_TYPE_OS=\"\\\"$target_os\\\"\""
1826   -GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___CONFIGURE_COMMAND=\"\\\"$CONFIGURE_COMMAND\\\"\""
  1825 +GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___CONFIGURE_COMMAND=\"\\\"`echo "$0$ac_configure_args" | sed -e s/\\\\\\\\/\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\/g -e s/\\\\\\\"/\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"/g`\"\\\""
1827 1826 GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___OBJ_EXTENSION=\"\\\"$obj\\\"\""
1828 1827 GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___EXE_EXTENSION=\"\\\"$exe\\\"\""
1829 1828 GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___BAT_EXTENSION=\"\\\"$bat\\\"\""
4 include/stamp.h
@@ -2,5 +2,5 @@
2 2 * Time stamp of last source code repository commit.
3 3 */
4 4
5   -#define ___STAMP_YMD 20120128
6   -#define ___STAMP_HMS 14203
  5 +#define ___STAMP_YMD 20120129
  6 +#define ___STAMP_HMS 215358
4 prebuilt/macosx/build
... ... @@ -1,6 +1,6 @@
1 1 #! /bin/sh
2 2
3   -# Copyright (c) 1994-2009 by Marc Feeley, All Rights Reserved.
  3 +# Copyright (c) 1994-2012 by Marc Feeley, All Rights Reserved.
4 4
5 5 herefromroot="prebuilt/macosx"
6 6 rootfromhere="../.."
@@ -49,7 +49,7 @@ for VARIANT in intel32 intel64; do
49 49
50 50 SYSROOT="/Developer/SDKs/MacOSX10.6.sdk"
51 51
52   - CC="gcc" CFLAGS="-isysroot $SYSROOT $CONFIG_ARCH" LDFLAGS="-mmacosx-version-min=10.5 -Wl,-syslibroot,$SYSROOT $CONFIG_ARCH" ./configure "$CONFIG_BUILD" --prefix="$INSTALL_PREFIX" --enable-multiple-versions --enable-symlinks --enable-single-host # --enable-gcc-opts
  52 + CFLAGS="-isysroot $SYSROOT $CONFIG_ARCH" LDFLAGS="-mmacosx-version-min=10.5 -Wl,-syslibroot,$SYSROOT $CONFIG_ARCH" ./configure "$CONFIG_BUILD" --prefix="$INSTALL_PREFIX" --enable-multiple-versions --enable-symlinks --enable-single-host CC="gcc"
53 53
54 54 cd "$herefromroot"
55 55
4 prebuilt/windows/build
... ... @@ -1,6 +1,6 @@
1 1 #! /bin/sh
2 2
3   -# Copyright (c) 1994-2011 by Marc Feeley, All Rights Reserved.
  3 +# Copyright (c) 1994-2012 by Marc Feeley, All Rights Reserved.
4 4
5 5 herefromroot="prebuilt/windows"
6 6 rootfromhere="../.."
@@ -28,7 +28,7 @@ for VARIANT in mingw visualc; do
28 28 ;;
29 29 esac
30 30
31   - cmd /c "C:\PROGRA~1\MICROS~1.0\VC\VCVARS~1.BAT && c:/MinGW/msys/1.0/bin/sh -c \"CC=\\\"$CONFIG_CC\\\" ./configure --prefix=\\\"$DOS_INSTALL_PREFIX\\\" --enable-multiple-versions --enable-symlinks --enable-single-host # --enable-gcc-opts\""
  31 + cmd /c "C:\PROGRA~1\MICROS~1.0\VC\VCVARS~1.BAT && c:/MinGW/msys/1.0/bin/sh -c \"./configure --prefix=\\\"$DOS_INSTALL_PREFIX\\\" --enable-multiple-versions --enable-symlinks --enable-single-host CC=\\\"$CONFIG_CC\\\"\""
32 32
33 33 cd "$herefromroot"
34 34

0 comments on commit c5cd419

Please sign in to comment.
Something went wrong with that request. Please try again.