Removed MOZ_WIN32_TARGET, which is just a synonym of OS_TARGET.
Modified Files: configure configure.in config/autoconf.mk.in pr/src/md/windows/Makefile.in pr/src/md/windows/objs.mk
This commit is contained in:
wtc%netscape.com
Родитель
d31ac9d3b6
Коммит
0bb0a60b6b
|
|
@ -86,7 +86,6 @@ HOST_CFLAGS = @HOST_CFLAGS@
|
|||
DEFINES = @DEFINES@ @DEFS@
|
||||
|
||||
MDCPUCFG_H = @MDCPUCFG_H@
|
||||
MOZ_WIN32_TARGET= @MOZ_WIN32_TARGET@
|
||||
PR_MD_CSRCS = @PR_MD_CSRCS@
|
||||
PR_MD_ASFILES = @PR_MD_ASFILES@
|
||||
PR_MD_ARCH_DIR = @PR_MD_ARCH_DIR@
|
||||
|
|
|
|||
|
|
@ -817,9 +817,9 @@ fi
|
|||
# Check whether --enable-win32-target or --disable-win32-target was given.
|
||||
if test "${enable_win32_target+set}" = set; then
|
||||
enableval="$enable_win32_target"
|
||||
MOZ_WIN32_TARGET=`echo $enableval | tr a-z A-Z`
|
||||
OS_TARGET=`echo $enableval | tr a-z A-Z`
|
||||
else
|
||||
MOZ_WIN32_TARGET=
|
||||
OS_TARGET=
|
||||
fi
|
||||
|
||||
|
||||
|
|
@ -2723,7 +2723,6 @@ fi
|
|||
|
||||
if test -n "$MOZILLA_CLIENT" && test "$OS_ARCH" = "WINNT"; then
|
||||
OS_TARGET=WIN95
|
||||
MOZ_WIN32_TARGET=WIN95
|
||||
if test -n "$MOZ_DEBUG"; then
|
||||
USE_DEBUG_RTL=1
|
||||
fi
|
||||
|
|
@ -2737,9 +2736,6 @@ fi
|
|||
if test "$OS_TARGET" = "WIN16"; then
|
||||
OS_RELEASE=
|
||||
fi
|
||||
if test -z "$MOZ_WIN32_TARGET"; then
|
||||
MOZ_WIN32_TARGET=$OS_TARGET
|
||||
fi
|
||||
OS_CONFIG="${OS_TARGET}${OS_RELEASE}"
|
||||
|
||||
|
||||
|
|
@ -2774,17 +2770,17 @@ EOF
|
|||
DSO_LDOPTS='-brtl -bM:SRE -bnoentry -bexpall'
|
||||
ac_safe=`echo "sys/atomic_op.h" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for sys/atomic_op.h""... $ac_c" 1>&6
|
||||
echo "configure:2778: checking for sys/atomic_op.h" >&5
|
||||
echo "configure:2774: checking for sys/atomic_op.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 2783 "configure"
|
||||
#line 2779 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <sys/atomic_op.h>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:2788: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:2784: \"$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*
|
||||
|
|
@ -3667,7 +3663,7 @@ EOF
|
|||
|
||||
OS_DLLFLAGS='-nologo -DLL -SUBSYSTEM:WINDOWS -PDB:NONE'
|
||||
|
||||
case "$MOZ_WIN32_TARGET" in
|
||||
case "$OS_TARGET" in
|
||||
WINNT)
|
||||
MDCPUCFG_H=_winnt.cfg
|
||||
;;
|
||||
|
|
@ -3678,7 +3674,7 @@ EOF
|
|||
MDCPUCFG_H=_win16.cfg
|
||||
;;
|
||||
*)
|
||||
{ echo "configure: error: Missing MOZ_WIN32_TARGET for ${target}. Use --enable-win32-target to set." 1>&2; exit 1; }
|
||||
{ echo "configure: error: Missing OS_TARGET for ${target}. Use --enable-win32-target to set." 1>&2; exit 1; }
|
||||
;;
|
||||
esac
|
||||
|
||||
|
|
@ -3993,17 +3989,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:3997: checking for machine/builtins.h" >&5
|
||||
echo "configure:3993: 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 4002 "configure"
|
||||
#line 3998 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <machine/builtins.h>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:4007: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:4003: \"$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*
|
||||
|
|
@ -4541,12 +4537,12 @@ fi
|
|||
if test -z "$SKIP_LIBRARY_CHECKS"; then
|
||||
|
||||
echo $ac_n "checking for dlopen""... $ac_c" 1>&6
|
||||
echo "configure:4545: checking for dlopen" >&5
|
||||
echo "configure:4541: 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 4550 "configure"
|
||||
#line 4546 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char dlopen(); below. */
|
||||
|
|
@ -4569,7 +4565,7 @@ dlopen();
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:4573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:4569: \"$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
|
||||
|
|
@ -4588,7 +4584,7 @@ else
|
|||
echo "$ac_t""no" 1>&6
|
||||
|
||||
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
|
||||
echo "configure:4592: checking for dlopen in -ldl" >&5
|
||||
echo "configure:4588: 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
|
||||
|
|
@ -4596,7 +4592,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ldl $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4600 "configure"
|
||||
#line 4596 "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
|
||||
|
|
@ -4607,7 +4603,7 @@ int main() {
|
|||
dlopen()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:4611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:4607: \"$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
|
||||
|
|
@ -4635,13 +4631,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:4639: checking whether ${CC-cc} needs -traditional" >&5
|
||||
echo "configure:4635: 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 4645 "configure"
|
||||
#line 4641 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <sgtty.h>
|
||||
Autoconf TIOCGETP
|
||||
|
|
@ -4659,7 +4655,7 @@ rm -f conftest*
|
|||
|
||||
if test $ac_cv_prog_gcc_traditional = no; then
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4663 "configure"
|
||||
#line 4659 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <termio.h>
|
||||
Autoconf TCGETA
|
||||
|
|
@ -4683,12 +4679,12 @@ fi
|
|||
for ac_func in lchown strerror
|
||||
do
|
||||
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
|
||||
echo "configure:4687: checking for $ac_func" >&5
|
||||
echo "configure:4683: 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 4692 "configure"
|
||||
#line 4688 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char $ac_func(); below. */
|
||||
|
|
@ -4711,7 +4707,7 @@ $ac_func();
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:4715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:4711: \"$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
|
||||
|
|
@ -4742,7 +4738,7 @@ done
|
|||
|
||||
|
||||
echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6
|
||||
echo "configure:4746: checking for pthread_create in -lpthreads" >&5
|
||||
echo "configure:4742: checking for pthread_create in -lpthreads" >&5
|
||||
echo "
|
||||
#include <pthread.h>
|
||||
void *foo(void *v) { int a = 1; }
|
||||
|
|
@ -4764,7 +4760,7 @@ echo "
|
|||
echo "$ac_t""no" 1>&6
|
||||
|
||||
echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
|
||||
echo "configure:4768: checking for pthread_create in -lpthread" >&5
|
||||
echo "configure:4764: checking for pthread_create in -lpthread" >&5
|
||||
echo "
|
||||
#include <pthread.h>
|
||||
void *foo(void *v) { int a = 1; }
|
||||
|
|
@ -4786,7 +4782,7 @@ echo "
|
|||
echo "$ac_t""no" 1>&6
|
||||
|
||||
echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
|
||||
echo "configure:4790: checking for pthread_create in -lc_r" >&5
|
||||
echo "configure:4786: checking for pthread_create in -lc_r" >&5
|
||||
echo "
|
||||
#include <pthread.h>
|
||||
void *foo(void *v) { int a = 1; }
|
||||
|
|
@ -4808,7 +4804,7 @@ echo "
|
|||
echo "$ac_t""no" 1>&6
|
||||
|
||||
echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6
|
||||
echo "configure:4812: checking for pthread_create in -lc" >&5
|
||||
echo "configure:4808: checking for pthread_create in -lc" >&5
|
||||
echo "
|
||||
#include <pthread.h>
|
||||
void *foo(void *v) { int a = 1; }
|
||||
|
|
@ -4958,7 +4954,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:4962: checking whether ${CC-cc} accepts -pthread" >&5
|
||||
echo "configure:4958: 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
|
||||
|
|
@ -4974,7 +4970,7 @@ echo "configure:4962: 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:4978: checking whether ${CC-cc} accepts -pthreads" >&5
|
||||
echo "configure:4974: 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
|
||||
|
|
@ -5302,7 +5298,6 @@ fi
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
MAKEFILES="
|
||||
|
|
@ -5548,7 +5543,6 @@ s%@MOD_MINOR_VERSION@%$MOD_MINOR_VERSION%g
|
|||
s%@MOD_REVISION_VERSION@%$MOD_REVISION_VERSION%g
|
||||
s%@NSPR_MODNAME@%$NSPR_MODNAME%g
|
||||
s%@MDCPUCFG_H@%$MDCPUCFG_H%g
|
||||
s%@MOZ_WIN32_TARGET@%$MOZ_WIN32_TARGET%g
|
||||
s%@PR_MD_CSRCS@%$PR_MD_CSRCS%g
|
||||
s%@PR_MD_ASFILES@%$PR_MD_ASFILES%g
|
||||
s%@PR_MD_ARCH_DIR@%$PR_MD_ARCH_DIR%g
|
||||
|
|
|
|||
|
|
@ -175,8 +175,8 @@ AC_ARG_ENABLE(debug,
|
|||
AC_ARG_ENABLE(win32-target,
|
||||
[ --enable-win32-target=\$t
|
||||
Specify win32 flavor. (WIN95 or WINNT)],
|
||||
MOZ_WIN32_TARGET=`echo $enableval | tr a-z A-Z`,
|
||||
MOZ_WIN32_TARGET=)
|
||||
OS_TARGET=`echo $enableval | tr a-z A-Z`,
|
||||
OS_TARGET=)
|
||||
|
||||
AC_ARG_ENABLE(debug-rtl,
|
||||
[ --enable-debug-rtl Use the MSVC debug runtime library],
|
||||
|
|
@ -575,7 +575,6 @@ fi
|
|||
|
||||
if test -n "$MOZILLA_CLIENT" && test "$OS_ARCH" = "WINNT"; then
|
||||
OS_TARGET=WIN95
|
||||
MOZ_WIN32_TARGET=WIN95
|
||||
if test -n "$MOZ_DEBUG"; then
|
||||
USE_DEBUG_RTL=1
|
||||
fi
|
||||
|
|
@ -589,9 +588,6 @@ fi
|
|||
if test "$OS_TARGET" = "WIN16"; then
|
||||
OS_RELEASE=
|
||||
fi
|
||||
if test -z "$MOZ_WIN32_TARGET"; then
|
||||
MOZ_WIN32_TARGET=$OS_TARGET
|
||||
fi
|
||||
OS_CONFIG="${OS_TARGET}${OS_RELEASE}"
|
||||
|
||||
dnl ========================================================
|
||||
|
|
@ -1167,7 +1163,7 @@ case "$target" in
|
|||
|
||||
OS_DLLFLAGS='-nologo -DLL -SUBSYSTEM:WINDOWS -PDB:NONE'
|
||||
|
||||
case "$MOZ_WIN32_TARGET" in
|
||||
case "$OS_TARGET" in
|
||||
WINNT)
|
||||
MDCPUCFG_H=_winnt.cfg
|
||||
;;
|
||||
|
|
@ -1178,7 +1174,7 @@ case "$target" in
|
|||
MDCPUCFG_H=_win16.cfg
|
||||
;;
|
||||
*)
|
||||
AC_MSG_ERROR([Missing MOZ_WIN32_TARGET for ${target}. Use --enable-win32-target to set.])
|
||||
AC_MSG_ERROR([Missing OS_TARGET for ${target}. Use --enable-win32-target to set.])
|
||||
;;
|
||||
esac
|
||||
|
||||
|
|
@ -2133,7 +2129,6 @@ AC_SUBST(MOD_MINOR_VERSION)
|
|||
AC_SUBST(MOD_REVISION_VERSION)
|
||||
AC_SUBST(NSPR_MODNAME)
|
||||
AC_SUBST(MDCPUCFG_H)
|
||||
AC_SUBST(MOZ_WIN32_TARGET)
|
||||
AC_SUBST(PR_MD_CSRCS)
|
||||
AC_SUBST(PR_MD_ASFILES)
|
||||
AC_SUBST(PR_MD_ARCH_DIR)
|
||||
|
|
|
|||
|
|
@ -42,10 +42,6 @@ include $(MOD_DEPTH)/config/autoconf.mk
|
|||
|
||||
include $(topsrcdir)/config/config.mk
|
||||
|
||||
ifdef USE_AUTOCONF
|
||||
OS_TARGET=$(MOZ_WIN32_TARGET)
|
||||
endif
|
||||
|
||||
ifeq ($(OS_TARGET), WIN16)
|
||||
CSRCS = \
|
||||
w16null.c \
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
#
|
||||
|
||||
|
||||
ifeq (WINNT,$(MOZ_WIN32_TARGET))
|
||||
ifeq ($(OS_TARGET),WINNT)
|
||||
CSRCS = ntmisc.c \
|
||||
ntsec.c \
|
||||
ntsem.c \
|
||||
|
|
@ -47,7 +47,7 @@ CSRCS = ntmisc.c \
|
|||
w32rng.c \
|
||||
w32shm.c
|
||||
else
|
||||
ifeq (WIN95,$(MOZ_WIN32_TARGET))
|
||||
ifeq ($(OS_TARGET),WIN95)
|
||||
CSRCS = ntmisc.c \
|
||||
ntsec.c \
|
||||
ntsem.c \
|
||||
|
|
@ -64,7 +64,7 @@ CSRCS = ntmisc.c \
|
|||
w32shm.c \
|
||||
w95dllmain.c
|
||||
else
|
||||
ifeq (WIN16,$(MOZ_WIN32_TARGET))
|
||||
ifeq ($(OS_TARGET),WIN16)
|
||||
CSRCS = w16null.c \
|
||||
w16thred.c \
|
||||
w16proc.c \
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче