Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-29 07:42:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed redundant program checks.

Browse Source 
Added target case for *-mingw*
Don't check for NSPR libs when cross-compiling.  Assume that they exist for now.
Added MDCPUCFG to CFLAGS for INTERNAL_TOOLS builds.
This commit is contained in:
cls%seawood.org 1999-09-02 23:58:00 +00:00
parent c903641346
commit f277b79642
2 changed files with 44 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/rules.mk
View File

@ -80,8 +80,8 @@ endif
ifdef INTERNAL_TOOLS
CC=$(HOST_CC)
CXX=$(HOST_CXX)
CFLAGS=$(HOST_CFLAGS) -I$(DIST)/include $(NSPR_CFLAGS)
CXXFLAGS=$(HOST_CXXFLAGS) -I$(DIST)/include $(NSPR_CFLAGS)
CFLAGS=$(HOST_CFLAGS) -I$(DIST)/include $(NSPR_CFLAGS) -DMDCPUCFG=$(HOST_NSPR_MDCPUCFG)
CXXFLAGS=$(HOST_CXXFLAGS) -I$(DIST)/include $(NSPR_CFLAGS) -DMDCPUCFG=$(HOST_NSPR_MDCPUCFG)
RANLIB=$(HOST_RANLIB)
endif

60
configure.in
View File

@ -393,16 +393,6 @@ fi
AC_PROG_MAKE_SET
dnl Support for X11 makedepend, if found on the system
dnl ========================================================
AC_PATH_PROG(SYSTEM_MAKEDEPEND,makedepend)
AC_PATH_PROGS(EMACS, xemacs lemacs emacs, :)
AC_PATH_PROGS(PERL, perl5 perl, :)
AC_PATH_PROG(WHOAMI, whoami, :)
AC_PATH_PROG(UNZIP, unzip, :)
AC_PATH_PROG(ZIP, zip, :)
AC_PATH_XTRA
dnl ========================================================
@ -615,6 +605,41 @@ case "$target" in
esac
;;
*-mingw*)
AC_DEFINE(_WINDOWS)
TARGET_MD_ARCH=win32
if test -z "$GNU_CC"; then
OBJ_SUFFIX=obj
LIB_SUFFIX=lib
DLL_SUFFIX=dll
fi
MKSHLIB='$(DLLTOOL) --as=$(AS) -k --dllname $(LIBRARY_NAME).dll --output-lib $@'
MKCSHLIB='$(DLLTOOL) --as=$(AS) -k --dllname $(LIBRARY_NAME).dll --output-lib $@'
MKSHLIB_FORCE_ALL=
MKSHLIB_UNFORCE_ALL=
DSO_LDOPTS=
DSO_CFLAGS=
DSO_PIC_CFLAGS=
OS_TARGET=WINNT
dnl Hardcode to win95 for now - cls
TARGET_NSPR_MDCPUCFG='\"md/_win95.cfg\"'
case "$target" in
i?86-*)
AC_DEFINE(_X86_)
;;
alpha-*)
AC_DEFINE(_ALPHA_)
;;
mips-*)
AC_DEFINE(_MIPS_)
;;
*)
AC_DEFINE(_CPU_ARCH_NOT_DEFINED)
;;
esac
;;
*-netbsd*)
DLL_SUFFIX="so.1.0"
DSO_CFLAGS=''
@ -1641,19 +1666,19 @@ AC_MSG_CHECKING("for PR_GetCurrentThread in -lnspr$NSPR_VERSION with thread lib"
AC_MSG_RESULT("$result")
fi
dnl AC_CHECK_LIB(nspr$NSPR_VERSION, PR_GetUniqueIdentity, NSPR_LIBS="-lnspr$NSPR_VERSION $NSPR_LIBS",
dnl [MISSING_NSPR="$MISSING_NSPR -lnspr$NSPR_VERSION"], $NSPR_LIBS)
AC_CHECK_LIB(plc$NSPR_VERSION, PL_CreateOptState, NSPR_LIBS="-lplc$NSPR_VERSION $NSPR_LIBS",
if test "$cross_compiling" = "yes"; then
NSPR_LIBS="-lplds$NSPR_VERSION -lplc$NSPR_VERSION $NSPR_LIBS"
else
AC_CHECK_LIB(plc$NSPR_VERSION, PL_CreateOptState, NSPR_LIBS="-lplc$NSPR_VERSION $NSPR_LIBS",
[MISSING_NSPR="$MISSING_NSPR -lplc$NSPR_VERSION"], $NSPR_LIBS)
AC_CHECK_LIB(plds$NSPR_VERSION, PL_GetEvent, NSPR_LIBS="-lplds$NSPR_VERSION $NSPR_LIBS",
AC_CHECK_LIB(plds$NSPR_VERSION, PL_GetEvent, NSPR_LIBS="-lplds$NSPR_VERSION $NSPR_LIBS",
[MISSING_NSPR="$MISSING_NSPR -lplds$NSPR_VERSION"], $NSPR_LIBS)
fi
CFLAGS=$_SAVE_CFLAGS
LDFLAGS=$_SAVE_LDFLAGS
LIBS=$_SAVE_LIBS
fi
fi # ! CROSS_COMPILE
if test "${NSPR_DIR}" -a -d "${NSPR_DIR}"; then
NSPR_INCLUDE_DIR="${NSPR_DIR}/include"
@ -2916,7 +2941,6 @@ if test !"$MODULAR_NETLIB"; then
AC_DEFINE(CookieManagement)
fi
AC_SUBST(OS_TARGET)
if test "$OS_TARGET" = "OS2"; then
AC_DEFINE(XP_PC)
elif test "$OS_TARGET" = "WINNT"; then