Path translation fixes for msys.
Thanks to Howard Chu <hyc@symas.com> for the patches. Bug #294122 r=cls a=shaver git-svn-id: svn://10.0.0.236/trunk@174037 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
cls%seawood.org
parent
2be4d7e6d0
commit
da2cda38ed
@ -57,6 +57,7 @@ endif
|
||||
|
||||
ifeq ($(OS_ARCH), WINNT)
|
||||
COMPONENT_PULL_METHOD=FTP
|
||||
win_srcdir:=$(subst $(topsrcdir),$(WIN_TOP_SRC),$(srcdir))
|
||||
endif
|
||||
|
||||
# component tags for internal build only
|
||||
|
||||
@ -99,6 +99,7 @@ NSINSTALL = @NSINSTALL@
|
||||
FILTER = @FILTER@
|
||||
IMPLIB = @IMPLIB@
|
||||
CYGWIN_WRAPPER = @CYGWIN_WRAPPER@
|
||||
WIN_TOP_SRC = @WIN_TOP_SRC@
|
||||
|
||||
OS_CPPFLAGS = @CPPFLAGS@
|
||||
OS_CFLAGS = $(OS_CPPFLAGS) @CFLAGS@ $(DSO_CFLAGS)
|
||||
|
||||
65
mozilla/directory/c-sdk/configure
vendored
65
mozilla/directory/c-sdk/configure
vendored
@ -3000,12 +3000,17 @@ OS_CONFIG="${OS_TARGET}${OS_RELEASE}"
|
||||
|
||||
|
||||
case "$host" in
|
||||
*-mingw*|*-cygwin*|*-msvc*|*-mks*)
|
||||
*-mingw*)
|
||||
NSINSTALL=nsinstall
|
||||
WIN_TOP_SRC=`cd $srcdir && pwd -W`
|
||||
;;
|
||||
*-cygwin*|*-msvc*|*-mks*)
|
||||
CYGWIN_WRAPPER='sh $(topsrcdir)/config/cygwin-wrapper'
|
||||
NSINSTALL='$(CYGWIN_WRAPPER) nsinstall'
|
||||
if test "`${PERL} -v | grep -c cygwin 2>/dev/null`" = 0; then
|
||||
PERL='$(CYGWIN_WRAPPER) perl'
|
||||
fi
|
||||
WIN_TOP_SRC=`cygpath -w $srcdir | sed -e 's|\\\\|/|g'`
|
||||
;;
|
||||
*-beos*)
|
||||
HOST_CFLAGS="$HOST_CFLAGS -DXP_BEOS -DBeOS -DBEOS -D_POSIX_SOURCE"
|
||||
@ -3035,17 +3040,17 @@ EOF
|
||||
DSO_LDOPTS='-brtl -bM:SRE -bnoentry -bexpall -blibpath:/usr/lib:/lib'
|
||||
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:3039: checking for sys/atomic_op.h" >&5
|
||||
echo "configure:3044: 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 3044 "configure"
|
||||
#line 3049 "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:3049: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:3054: \"$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*
|
||||
@ -3203,7 +3208,7 @@ EOF
|
||||
_DEBUG_FLAGS='-gdwarf-2 -O0'
|
||||
MKSHLIB='$(CCC) $(DSO_LDOPTS) -o $@'
|
||||
echo $ac_n "checking for gethostbyaddr in -lbind""... $ac_c" 1>&6
|
||||
echo "configure:3207: checking for gethostbyaddr in -lbind" >&5
|
||||
echo "configure:3212: checking for gethostbyaddr in -lbind" >&5
|
||||
ac_lib_var=`echo bind'_'gethostbyaddr | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -3211,7 +3216,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lbind $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3215 "configure"
|
||||
#line 3220 "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
|
||||
@ -3222,7 +3227,7 @@ int main() {
|
||||
gethostbyaddr()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:3231: \"$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
|
||||
@ -4440,17 +4445,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:4444: checking for machine/builtins.h" >&5
|
||||
echo "configure:4449: 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 4449 "configure"
|
||||
#line 4454 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <machine/builtins.h>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:4454: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:4459: \"$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*
|
||||
@ -4853,12 +4858,12 @@ esac
|
||||
if test -z "$SKIP_LIBRARY_CHECKS"; then
|
||||
|
||||
echo $ac_n "checking for dlopen""... $ac_c" 1>&6
|
||||
echo "configure:4857: checking for dlopen" >&5
|
||||
echo "configure:4862: 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 4862 "configure"
|
||||
#line 4867 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char dlopen(); below. */
|
||||
@ -4881,7 +4886,7 @@ dlopen();
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:4885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:4890: \"$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
|
||||
@ -4900,7 +4905,7 @@ else
|
||||
echo "$ac_t""no" 1>&6
|
||||
|
||||
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
|
||||
echo "configure:4904: checking for dlopen in -ldl" >&5
|
||||
echo "configure:4909: 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
|
||||
@ -4908,7 +4913,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ldl $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4912 "configure"
|
||||
#line 4917 "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
|
||||
@ -4919,7 +4924,7 @@ int main() {
|
||||
dlopen()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:4923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:4928: \"$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
|
||||
@ -4947,13 +4952,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:4951: checking whether ${CC-cc} needs -traditional" >&5
|
||||
echo "configure:4956: 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 4957 "configure"
|
||||
#line 4962 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <sgtty.h>
|
||||
Autoconf TIOCGETP
|
||||
@ -4971,7 +4976,7 @@ rm -f conftest*
|
||||
|
||||
if test $ac_cv_prog_gcc_traditional = no; then
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4975 "configure"
|
||||
#line 4980 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <termio.h>
|
||||
Autoconf TCGETA
|
||||
@ -4995,12 +5000,12 @@ fi
|
||||
for ac_func in lchown strerror
|
||||
do
|
||||
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
|
||||
echo "configure:4999: checking for $ac_func" >&5
|
||||
echo "configure:5004: 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 5004 "configure"
|
||||
#line 5009 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char $ac_func(); below. */
|
||||
@ -5023,7 +5028,7 @@ $ac_func();
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:5027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:5032: \"$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
|
||||
@ -5061,7 +5066,7 @@ fi
|
||||
|
||||
|
||||
echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6
|
||||
echo "configure:5065: checking for pthread_create in -lpthreads" >&5
|
||||
echo "configure:5070: checking for pthread_create in -lpthreads" >&5
|
||||
echo "
|
||||
#include <pthread.h>
|
||||
void *foo(void *v) { int a = 1; }
|
||||
@ -5083,7 +5088,7 @@ echo "
|
||||
echo "$ac_t""no" 1>&6
|
||||
|
||||
echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
|
||||
echo "configure:5087: checking for pthread_create in -lpthread" >&5
|
||||
echo "configure:5092: checking for pthread_create in -lpthread" >&5
|
||||
echo "
|
||||
#include <pthread.h>
|
||||
void *foo(void *v) { int a = 1; }
|
||||
@ -5105,7 +5110,7 @@ echo "
|
||||
echo "$ac_t""no" 1>&6
|
||||
|
||||
echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
|
||||
echo "configure:5109: checking for pthread_create in -lc_r" >&5
|
||||
echo "configure:5114: checking for pthread_create in -lc_r" >&5
|
||||
echo "
|
||||
#include <pthread.h>
|
||||
void *foo(void *v) { int a = 1; }
|
||||
@ -5127,7 +5132,7 @@ echo "
|
||||
echo "$ac_t""no" 1>&6
|
||||
|
||||
echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6
|
||||
echo "configure:5131: checking for pthread_create in -lc" >&5
|
||||
echo "configure:5136: checking for pthread_create in -lc" >&5
|
||||
echo "
|
||||
#include <pthread.h>
|
||||
void *foo(void *v) { int a = 1; }
|
||||
@ -5277,7 +5282,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:5281: checking whether ${CC-cc} accepts -pthread" >&5
|
||||
echo "configure:5286: 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
|
||||
@ -5293,7 +5298,7 @@ echo "configure:5281: 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:5297: checking whether ${CC-cc} accepts -pthreads" >&5
|
||||
echo "configure:5302: 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
|
||||
@ -5564,7 +5569,7 @@ fi
|
||||
RELEASE_OBJDIR_NAME="${OS_CONFIG}${CPU_ARCH_TAG}${COMPILER_TAG}${IMPL_STRATEGY}${OBJDIR_TAG}.${OBJDIR_SUFFIX}"
|
||||
|
||||
case "$target_os" in
|
||||
mingw*|cygwin*|msvc*|mksnt*)
|
||||
cygwin*|msvc*|mks*)
|
||||
CC="\$(CYGWIN_WRAPPER) $CC"
|
||||
CXX="\$(CYGWIN_WRAPPER) $CXX"
|
||||
RC="\$(CYGWIN_WRAPPER) $RC"
|
||||
@ -5655,6 +5660,7 @@ esac
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
MAKEFILES="
|
||||
@ -5932,6 +5938,7 @@ s%@DLLFLAGS@%$DLLFLAGS%g
|
||||
s%@EXEFLAGS@%$EXEFLAGS%g
|
||||
s%@OS_DLLFLAGS@%$OS_DLLFLAGS%g
|
||||
s%@CYGWIN_WRAPPER@%$CYGWIN_WRAPPER%g
|
||||
s%@WIN_TOP_SRC@%$WIN_TOP_SRC%g
|
||||
|
||||
CEOF
|
||||
EOF
|
||||
|
||||
@ -690,12 +690,17 @@ dnl ========================================================
|
||||
dnl Override of system specific host options
|
||||
dnl ========================================================
|
||||
case "$host" in
|
||||
*-mingw*|*-cygwin*|*-msvc*|*-mks*)
|
||||
*-mingw*)
|
||||
NSINSTALL=nsinstall
|
||||
WIN_TOP_SRC=`cd $srcdir && pwd -W`
|
||||
;;
|
||||
*-cygwin*|*-msvc*|*-mks*)
|
||||
CYGWIN_WRAPPER='sh $(topsrcdir)/config/cygwin-wrapper'
|
||||
NSINSTALL='$(CYGWIN_WRAPPER) nsinstall'
|
||||
if test "`${PERL} -v | grep -c cygwin 2>/dev/null`" = 0; then
|
||||
PERL='$(CYGWIN_WRAPPER) perl'
|
||||
fi
|
||||
WIN_TOP_SRC=`cygpath -w $srcdir | sed -e 's|\\\\|/|g'`
|
||||
;;
|
||||
*-beos*)
|
||||
HOST_CFLAGS="$HOST_CFLAGS -DXP_BEOS -DBeOS -DBEOS -D_POSIX_SOURCE"
|
||||
@ -2242,10 +2247,10 @@ fi
|
||||
RELEASE_OBJDIR_NAME="${OS_CONFIG}${CPU_ARCH_TAG}${COMPILER_TAG}${IMPL_STRATEGY}${OBJDIR_TAG}.${OBJDIR_SUFFIX}"
|
||||
|
||||
dnl ========================================================
|
||||
dnl Use cygwin wrapper for win32 builds
|
||||
dnl Use cygwin wrapper for win32 builds, except MinGW/MSYS
|
||||
dnl ========================================================
|
||||
case "$target_os" in
|
||||
mingw*|cygwin*|msvc*|mksnt*)
|
||||
cygwin*|msvc*|mks*)
|
||||
CC="\$(CYGWIN_WRAPPER) $CC"
|
||||
CXX="\$(CYGWIN_WRAPPER) $CXX"
|
||||
RC="\$(CYGWIN_WRAPPER) $RC"
|
||||
@ -2340,6 +2345,7 @@ AC_SUBST(DLLFLAGS)
|
||||
AC_SUBST(EXEFLAGS)
|
||||
AC_SUBST(OS_DLLFLAGS)
|
||||
AC_SUBST(CYGWIN_WRAPPER)
|
||||
AC_SUBST(WIN_TOP_SRC)
|
||||
|
||||
dnl ========================================================
|
||||
dnl Generate output files.
|
||||
|
||||
@ -161,7 +161,7 @@ endif
|
||||
|
||||
# variable definitions for exported symbols
|
||||
ifeq ($(OS_ARCH), WINNT)
|
||||
LDAP_EXPORT_DEFS= $(srcdir)/../msdos/winsock/nsldap32.def
|
||||
LDAP_EXPORT_DEFS= $(win_srcdir)/../msdos/winsock/nsldap32.def
|
||||
else
|
||||
ifeq ($(OS_ARCH), OS2)
|
||||
LDAP_EXPORT_DEFS= $(OBJDIR_NAME)/libldap.def
|
||||
|
||||
@ -95,7 +95,7 @@ endif
|
||||
|
||||
# variable definitions for exported symbols
|
||||
ifeq ($(OS_ARCH), WINNT)
|
||||
PRLDAP_EXPORT_DEFS= $(srcdir)/../msdos/winsock/nsldappr32.def
|
||||
PRLDAP_EXPORT_DEFS= $(win_srcdir)/../msdos/winsock/nsldappr32.def
|
||||
else
|
||||
ifeq ($(OS_ARCH), OS2)
|
||||
PRLDAP_EXPORT_DEFS= $(OBJDIR_NAME)/libprldap.def
|
||||
|
||||
@ -93,7 +93,7 @@ endif
|
||||
|
||||
# variable definitions for exported symbols
|
||||
ifeq ($(OS_ARCH), WINNT)
|
||||
SSLDAP_EXPORT_DEFS= $(srcdir)/../msdos/winsock/nsldapssl32.def
|
||||
SSLDAP_EXPORT_DEFS= $(win_srcdir)/../msdos/winsock/nsldapssl32.def
|
||||
else
|
||||
SSLDAP_EXPORT_DEFS= $(SSLOBJDEST)/libldap_ssl.exp
|
||||
endif
|
||||
|
||||
63
mozilla/nsprpub/configure
vendored
63
mozilla/nsprpub/configure
vendored
@ -2976,7 +2976,10 @@ OS_CONFIG="${OS_TARGET}${OS_RELEASE}"
|
||||
|
||||
|
||||
case "$host" in
|
||||
*-mingw*|*-cygwin*|*-msvc*|*-mks*)
|
||||
*-mingw*)
|
||||
NSINSTALL=nsinstall
|
||||
;;
|
||||
*-cygwin*|*-msvc*|*-mks*)
|
||||
NSINSTALL='$(CYGWIN_WRAPPER) nsinstall'
|
||||
if test `echo "${PATH}" | grep -c \;` = 0; then
|
||||
CYGWIN_WRAPPER='sh $(topsrcdir)/build/cygwin-wrapper'
|
||||
@ -3010,17 +3013,17 @@ EOF
|
||||
DSO_LDOPTS='-brtl -bnortllib -bM:SRE -bnoentry -bexpall -blibpath:/usr/lib:/lib'
|
||||
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:3014: checking for sys/atomic_op.h" >&5
|
||||
echo "configure:3017: 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 3019 "configure"
|
||||
#line 3022 "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:3024: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:3027: \"$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*
|
||||
@ -3177,7 +3180,7 @@ EOF
|
||||
_DEBUG_FLAGS='-gdwarf-2 -O0'
|
||||
MKSHLIB='$(CCC) $(DSO_LDOPTS) -o $@'
|
||||
echo $ac_n "checking for gethostbyaddr in -lbind""... $ac_c" 1>&6
|
||||
echo "configure:3181: checking for gethostbyaddr in -lbind" >&5
|
||||
echo "configure:3184: checking for gethostbyaddr in -lbind" >&5
|
||||
ac_lib_var=`echo bind'_'gethostbyaddr | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -3185,7 +3188,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lbind $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3189 "configure"
|
||||
#line 3192 "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
|
||||
@ -3196,7 +3199,7 @@ int main() {
|
||||
gethostbyaddr()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:3203: \"$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
|
||||
@ -4427,17 +4430,17 @@ EOF
|
||||
_OPTIMIZE_FLAGS="$_OPTIMIZE_FLAGS -Olimit 4000"
|
||||
ac_safe=`echo "machine/builtins.h" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for machine/builtins.h""... $ac_c" 1>&6
|
||||
echo "configure:4431: checking for machine/builtins.h" >&5
|
||||
echo "configure:4434: 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 4436 "configure"
|
||||
#line 4439 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <machine/builtins.h>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:4441: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:4444: \"$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*
|
||||
@ -4979,7 +4982,7 @@ case $target in
|
||||
;;
|
||||
*)
|
||||
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
|
||||
echo "configure:4983: checking for dlopen in -ldl" >&5
|
||||
echo "configure:4986: 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
|
||||
@ -4987,7 +4990,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ldl $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4991 "configure"
|
||||
#line 4994 "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
|
||||
@ -4998,7 +5001,7 @@ int main() {
|
||||
dlopen()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:5002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:5005: \"$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
|
||||
@ -5015,17 +5018,17 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
|
||||
echo "configure:5019: checking for dlfcn.h" >&5
|
||||
echo "configure:5022: checking for dlfcn.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 5024 "configure"
|
||||
#line 5027 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <dlfcn.h>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:5029: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:5032: \"$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*
|
||||
@ -5058,13 +5061,13 @@ esac
|
||||
|
||||
if test $ac_cv_prog_gcc = yes; then
|
||||
echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
|
||||
echo "configure:5062: checking whether ${CC-cc} needs -traditional" >&5
|
||||
echo "configure:5065: 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 5068 "configure"
|
||||
#line 5071 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <sgtty.h>
|
||||
Autoconf TIOCGETP
|
||||
@ -5082,7 +5085,7 @@ rm -f conftest*
|
||||
|
||||
if test $ac_cv_prog_gcc_traditional = no; then
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 5086 "configure"
|
||||
#line 5089 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <termio.h>
|
||||
Autoconf TCGETA
|
||||
@ -5106,12 +5109,12 @@ fi
|
||||
for ac_func in lchown strerror
|
||||
do
|
||||
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
|
||||
echo "configure:5110: checking for $ac_func" >&5
|
||||
echo "configure:5113: 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 5115 "configure"
|
||||
#line 5118 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char $ac_func(); below. */
|
||||
@ -5134,7 +5137,7 @@ $ac_func();
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:5138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:5141: \"$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
|
||||
@ -5175,7 +5178,7 @@ hpux*)
|
||||
if test -z "$GNU_CC"; then
|
||||
|
||||
echo $ac_n "checking for +Olit support""... $ac_c" 1>&6
|
||||
echo "configure:5179: checking for +Olit support" >&5
|
||||
echo "configure:5182: checking for +Olit support" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_hpux_usable_olit_option'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -5209,7 +5212,7 @@ esac
|
||||
|
||||
|
||||
echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6
|
||||
echo "configure:5213: checking for pthread_create in -lpthreads" >&5
|
||||
echo "configure:5216: checking for pthread_create in -lpthreads" >&5
|
||||
echo "
|
||||
#include <pthread.h>
|
||||
void *foo(void *v) { return v; }
|
||||
@ -5231,7 +5234,7 @@ echo "
|
||||
echo "$ac_t""no" 1>&6
|
||||
|
||||
echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
|
||||
echo "configure:5235: checking for pthread_create in -lpthread" >&5
|
||||
echo "configure:5238: checking for pthread_create in -lpthread" >&5
|
||||
echo "
|
||||
#include <pthread.h>
|
||||
void *foo(void *v) { return v; }
|
||||
@ -5253,7 +5256,7 @@ echo "
|
||||
echo "$ac_t""no" 1>&6
|
||||
|
||||
echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
|
||||
echo "configure:5257: checking for pthread_create in -lc_r" >&5
|
||||
echo "configure:5260: checking for pthread_create in -lc_r" >&5
|
||||
echo "
|
||||
#include <pthread.h>
|
||||
void *foo(void *v) { return v; }
|
||||
@ -5275,7 +5278,7 @@ echo "
|
||||
echo "$ac_t""no" 1>&6
|
||||
|
||||
echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6
|
||||
echo "configure:5279: checking for pthread_create in -lc" >&5
|
||||
echo "configure:5282: checking for pthread_create in -lc" >&5
|
||||
echo "
|
||||
#include <pthread.h>
|
||||
void *foo(void *v) { return v; }
|
||||
@ -5427,7 +5430,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:5431: checking whether ${CC-cc} accepts -pthread" >&5
|
||||
echo "configure:5434: 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
|
||||
@ -5450,7 +5453,7 @@ echo "configure:5431: 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:5454: checking whether ${CC-cc} accepts -pthreads" >&5
|
||||
echo "configure:5457: 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
|
||||
@ -5764,7 +5767,7 @@ fi
|
||||
RELEASE_OBJDIR_NAME="${OS_CONFIG}${CPU_ARCH_TAG}${COMPILER_TAG}${IMPL_STRATEGY}${OBJDIR_TAG}.${OBJDIR_SUFFIX}"
|
||||
|
||||
case "$target_os" in
|
||||
mingw*|cygwin*|msvc*|mks*)
|
||||
cygwin*|msvc*|mks*)
|
||||
CC="\$(CYGWIN_WRAPPER) $CC"
|
||||
CXX="\$(CYGWIN_WRAPPER) $CXX"
|
||||
RC="\$(CYGWIN_WRAPPER) $RC"
|
||||
|
||||
@ -741,7 +741,10 @@ dnl ========================================================
|
||||
dnl Override of system specific host options
|
||||
dnl ========================================================
|
||||
case "$host" in
|
||||
*-mingw*|*-cygwin*|*-msvc*|*-mks*)
|
||||
*-mingw*)
|
||||
NSINSTALL=nsinstall
|
||||
;;
|
||||
*-cygwin*|*-msvc*|*-mks*)
|
||||
NSINSTALL='$(CYGWIN_WRAPPER) nsinstall'
|
||||
if test `echo "${PATH}" | grep -c \;` = 0; then
|
||||
CYGWIN_WRAPPER='sh $(topsrcdir)/build/cygwin-wrapper'
|
||||
@ -2518,10 +2521,10 @@ fi
|
||||
RELEASE_OBJDIR_NAME="${OS_CONFIG}${CPU_ARCH_TAG}${COMPILER_TAG}${IMPL_STRATEGY}${OBJDIR_TAG}.${OBJDIR_SUFFIX}"
|
||||
|
||||
dnl ========================================================
|
||||
dnl Use cygwin wrapper for win32 builds
|
||||
dnl Use cygwin wrapper for win32 builds, except MSYS/MinGW
|
||||
dnl ========================================================
|
||||
case "$target_os" in
|
||||
mingw*|cygwin*|msvc*|mks*)
|
||||
cygwin*|msvc*|mks*)
|
||||
CC="\$(CYGWIN_WRAPPER) $CC"
|
||||
CXX="\$(CYGWIN_WRAPPER) $CXX"
|
||||
RC="\$(CYGWIN_WRAPPER) $RC"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user