diff options
| -rwxr-xr-x | configure | 55 | ||||
| -rw-r--r-- | configure.in | 13 |
2 files changed, 31 insertions, 37 deletions
@@ -3589,7 +3589,6 @@ EOF DLL_SUFFIX=dll CFLAGS="$CFLAGS -W3 -nologo -GF -Gy" - _DEBUG_FLAGS= if test -n "$MOZ_DEBUG"; then cat >> confdefs.h <<\EOF @@ -3602,11 +3601,11 @@ EOF if test -n "$MOZ_OPTIMIZE"; then CFLAGS="$CFLAGS -MD" - OPTIMIZER=-O2 + _OPTIMIZE_FLAGS=-O2 DLLFLAGS='-OUT:"$@"' if test -n "$MOZ_PROFILE"; then - OPTIMIZER="$OPTIMIZER -Z7" + _OPTIMIZE_FLAGS="$_OPTIMIZE_FLAGS -Z7" DLLFLAGS="$DLLFLAGS -DEBUG -DEBUGTYPE:CV" LDFLAGS="$LDFLAGS -DEBUG -DEBUGTYPE:CV" fi @@ -3616,7 +3615,7 @@ EOF else CFLAGS="$CFLAGS -MD" fi - OPTIMIZER="-Od -Z7" + _DEBUG_FLAGS="-Od -Z7" DLLFLAGS='-DEBUG -DEBUGTYPE:CV -OUT:"$@"' if test -n "$GLOWCODE"; then DLLFLAGS='-DEBUG -DEBUGTYPE:both -INCLUDE:_GlowCode -OUT:"$@"' @@ -4009,17 +4008,17 @@ EOF ac_safe=`echo "machine/builtins.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for machine/builtins.h""... $ac_c" 1>&6 -echo "configure:4013: checking for machine/builtins.h" >&5 +echo "configure:4012: checking for machine/builtins.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4018 "configure" +#line 4017 "configure" #include "confdefs.h" #include <machine/builtins.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4023: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4022: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4566,12 +4565,12 @@ esac if test -z "$SKIP_LIBRARY_CHECKS"; then echo $ac_n "checking for dlopen""... $ac_c" 1>&6 -echo "configure:4570: checking for dlopen" >&5 +echo "configure:4569: checking for dlopen" >&5 if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4575 "configure" +#line 4574 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dlopen(); below. */ @@ -4594,7 +4593,7 @@ dlopen(); ; return 0; } EOF -if { (eval echo configure:4598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dlopen=yes" else @@ -4613,7 +4612,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:4617: checking for dlopen in -ldl" >&5 +echo "configure:4616: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4621,7 +4620,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <<EOF -#line 4625 "configure" +#line 4624 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4632,7 +4631,7 @@ int main() { dlopen() ; return 0; } EOF -if { (eval echo configure:4636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4660,13 +4659,13 @@ fi if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:4664: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:4663: checking whether ${CC-cc} needs -traditional" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext <<EOF -#line 4670 "configure" +#line 4669 "configure" #include "confdefs.h" #include <sgtty.h> Autoconf TIOCGETP @@ -4684,7 +4683,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext <<EOF -#line 4688 "configure" +#line 4687 "configure" #include "confdefs.h" #include <termio.h> Autoconf TCGETA @@ -4708,12 +4707,12 @@ fi for ac_func in lchown strerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4712: checking for $ac_func" >&5 +echo "configure:4711: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4717 "configure" +#line 4716 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4736,7 +4735,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:4740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4767,7 +4766,7 @@ done echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 -echo "configure:4771: checking for pthread_create in -lpthreads" >&5 +echo "configure:4770: checking for pthread_create in -lpthreads" >&5 echo " #include <pthread.h> void *foo(void *v) { int a = 1; } @@ -4789,7 +4788,7 @@ echo " echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 -echo "configure:4793: checking for pthread_create in -lpthread" >&5 +echo "configure:4792: checking for pthread_create in -lpthread" >&5 echo " #include <pthread.h> void *foo(void *v) { int a = 1; } @@ -4811,7 +4810,7 @@ echo " echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 -echo "configure:4815: checking for pthread_create in -lc_r" >&5 +echo "configure:4814: checking for pthread_create in -lc_r" >&5 echo " #include <pthread.h> void *foo(void *v) { int a = 1; } @@ -4833,7 +4832,7 @@ echo " echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6 -echo "configure:4837: checking for pthread_create in -lc" >&5 +echo "configure:4836: checking for pthread_create in -lc" >&5 echo " #include <pthread.h> void *foo(void *v) { int a = 1; } @@ -4983,7 +4982,7 @@ if test -n "$USE_PTHREADS"; then rm -f conftest* ac_cv_have_dash_pthread=no echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6 -echo "configure:4987: checking whether ${CC-cc} accepts -pthread" >&5 +echo "configure:4986: checking whether ${CC-cc} accepts -pthread" >&5 echo 'int main() { return 0; }' | cat > conftest.c ${CC-cc} -pthread -o conftest conftest.c > conftest.out 2>&1 if test $? -eq 0; then @@ -4999,7 +4998,7 @@ echo "configure:4987: checking whether ${CC-cc} accepts -pthread" >&5 ac_cv_have_dash_pthreads=no if test "$ac_cv_have_dash_pthread" = "no"; then echo $ac_n "checking whether ${CC-cc} accepts -pthreads""... $ac_c" 1>&6 -echo "configure:5003: checking whether ${CC-cc} accepts -pthreads" >&5 +echo "configure:5002: checking whether ${CC-cc} accepts -pthreads" >&5 echo 'int main() { return 0; }' | cat > conftest.c ${CC-cc} -pthreads -o conftest conftest.c > conftest.out 2>&1 if test $? -eq 0; then @@ -5234,13 +5233,11 @@ if test -n "$_SAVE_OPTIMIZE_FLAGS"; then fi if test -n "$MOZ_OPTIMIZE"; then - CFLAGS="$CFLAGS $_OPTIMIZE_FLAGS" - CXXFLAGS="$CXXFLAGS $_OPTIMIZE_FLAGS" + OPTIMIZER=$_OPTIMIZE_FLAGS fi if test -n "$MOZ_DEBUG"; then - CFLAGS="$CFLAGS $_DEBUG_FLAGS" - CXXFLAGS="$CXXFLAGS $_DEBUG_FLAGS" + OPTIMIZER=$_DEBUG_FLAGS fi if test -n "$MOZ_OPTIMIZE"; then diff --git a/configure.in b/configure.in index 4ad51603..9c3c6901 100644 --- a/configure.in +++ b/configure.in @@ -1108,7 +1108,6 @@ case "$target" in DLL_SUFFIX=dll CFLAGS="$CFLAGS -W3 -nologo -GF -Gy" - _DEBUG_FLAGS= if test -n "$MOZ_DEBUG"; then AC_DEFINE(_DEBUG) @@ -1118,11 +1117,11 @@ case "$target" in if test -n "$MOZ_OPTIMIZE"; then CFLAGS="$CFLAGS -MD" - OPTIMIZER=-O2 + _OPTIMIZE_FLAGS=-O2 DLLFLAGS='-OUT:"$@"' if test -n "$MOZ_PROFILE"; then - OPTIMIZER="$OPTIMIZER -Z7" + _OPTIMIZE_FLAGS="$_OPTIMIZE_FLAGS -Z7" DLLFLAGS="$DLLFLAGS -DEBUG -DEBUGTYPE:CV" LDFLAGS="$LDFLAGS -DEBUG -DEBUGTYPE:CV" fi @@ -1132,7 +1131,7 @@ case "$target" in else CFLAGS="$CFLAGS -MD" fi - OPTIMIZER="-Od -Z7" + _DEBUG_FLAGS="-Od -Z7" DLLFLAGS='-DEBUG -DEBUGTYPE:CV -OUT:"$@"' if test -n "$GLOWCODE"; then DLLFLAGS='-DEBUG -DEBUGTYPE:both -INCLUDE:_GlowCode -OUT:"$@"' @@ -2110,13 +2109,11 @@ if test -n "$_SAVE_OPTIMIZE_FLAGS"; then fi if test -n "$MOZ_OPTIMIZE"; then - CFLAGS="$CFLAGS $_OPTIMIZE_FLAGS" - CXXFLAGS="$CXXFLAGS $_OPTIMIZE_FLAGS" + OPTIMIZER=$_OPTIMIZE_FLAGS fi if test -n "$MOZ_DEBUG"; then - CFLAGS="$CFLAGS $_DEBUG_FLAGS" - CXXFLAGS="$CXXFLAGS $_DEBUG_FLAGS" + OPTIMIZER=$_DEBUG_FLAGS fi if test -n "$MOZ_OPTIMIZE"; then |