Follow up to Bug 385091 - fix build problems on msys compilers/MozillaBuild. p=Neil,r=Rich Megginson

git-svn-id: svn://10.0.0.236/trunk@254163 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bugzilla%standard8.plus.com
2008-09-11 14:38:35 +00:00
parent 54c37c5bc6
commit 35c76a5546
6 changed files with 52 additions and 54 deletions

View File

@@ -4726,7 +4726,6 @@ EOF
# Use temp file for windres (bug 213281)
RC="$WINDRES -O coff --use-temp-file"
else
CYGWIN_WRAPPER='sh $(topsrcdir)/config/cygwin-wrapper'
CC=cl
CXX=cl
LD=link
@@ -4734,7 +4733,7 @@ EOF
# Extract the first word of "lib", so it can be a program name with args.
set dummy lib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:4738: checking for $ac_word" >&5
echo "configure:4737: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_HAVE_MSVC_LIB'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4769,7 +4768,7 @@ fi
AR_FLAGS=
RANLIB='echo not_ranlib'
STRIP='echo not_strip'
RC='$(CYGWIN_WRAPPER) rc.exe'
RC=rc.exe
GARBAGE='$(OBJDIR)/vc20.pdb $(OBJDIR)/vc40.pdb'
OBJ_SUFFIX=obj
LIB_SUFFIX=lib
@@ -5258,17 +5257,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:5262: checking for machine/builtins.h" >&5
echo "configure:5261: 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 5267 "configure"
#line 5266 "configure"
#include "confdefs.h"
#include <machine/builtins.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:5272: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:5271: \"$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*
@@ -5655,12 +5654,12 @@ esac
if test -z "$SKIP_LIBRARY_CHECKS"; then
echo $ac_n "checking for dlopen""... $ac_c" 1>&6
echo "configure:5659: checking for dlopen" >&5
echo "configure:5658: 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 5664 "configure"
#line 5663 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char dlopen(); below. */
@@ -5683,7 +5682,7 @@ dlopen();
; return 0; }
EOF
if { (eval echo configure:5687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:5686: \"$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
@@ -5702,7 +5701,7 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
echo "configure:5706: checking for dlopen in -ldl" >&5
echo "configure:5705: 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
@@ -5710,7 +5709,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldl $LIBS"
cat > conftest.$ac_ext <<EOF
#line 5714 "configure"
#line 5713 "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
@@ -5721,7 +5720,7 @@ int main() {
dlopen()
; return 0; }
EOF
if { (eval echo configure:5725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:5724: \"$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
@@ -5749,13 +5748,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:5753: checking whether ${CC-cc} needs -traditional" >&5
echo "configure:5752: 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 5759 "configure"
#line 5758 "configure"
#include "confdefs.h"
#include <sgtty.h>
Autoconf TIOCGETP
@@ -5773,7 +5772,7 @@ rm -f conftest*
if test $ac_cv_prog_gcc_traditional = no; then
cat > conftest.$ac_ext <<EOF
#line 5777 "configure"
#line 5776 "configure"
#include "confdefs.h"
#include <termio.h>
Autoconf TCGETA
@@ -5797,12 +5796,12 @@ fi
for ac_func in lchown strerror getaddrinfo getnameinfo
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:5801: checking for $ac_func" >&5
echo "configure:5800: 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 5806 "configure"
#line 5805 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -5825,7 +5824,7 @@ $ac_func();
; return 0; }
EOF
if { (eval echo configure:5829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:5828: \"$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
@@ -5863,7 +5862,7 @@ fi
echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6
echo "configure:5867: checking for pthread_create in -lpthreads" >&5
echo "configure:5866: checking for pthread_create in -lpthreads" >&5
echo "
#include <pthread.h>
void *foo(void *v) { int a = 1; }
@@ -5885,7 +5884,7 @@ echo "
echo "$ac_t""no" 1>&6
echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
echo "configure:5889: checking for pthread_create in -lpthread" >&5
echo "configure:5888: checking for pthread_create in -lpthread" >&5
echo "
#include <pthread.h>
void *foo(void *v) { int a = 1; }
@@ -5907,7 +5906,7 @@ echo "
echo "$ac_t""no" 1>&6
echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
echo "configure:5911: checking for pthread_create in -lc_r" >&5
echo "configure:5910: checking for pthread_create in -lc_r" >&5
echo "
#include <pthread.h>
void *foo(void *v) { int a = 1; }
@@ -5929,7 +5928,7 @@ echo "
echo "$ac_t""no" 1>&6
echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6
echo "configure:5933: checking for pthread_create in -lc" >&5
echo "configure:5932: checking for pthread_create in -lc" >&5
echo "
#include <pthread.h>
void *foo(void *v) { int a = 1; }
@@ -6063,7 +6062,7 @@ fi
echo $ac_n "checking for --with-sasl""... $ac_c" 1>&6
echo "configure:6067: checking for --with-sasl" >&5
echo "configure:6066: checking for --with-sasl" >&5
# Check whether --with-sasl or --without-sasl was given.
if test "${with_sasl+set}" = set; then
withval="$with_sasl"
@@ -6104,7 +6103,7 @@ fi
echo $ac_n "checking for --with-sasl-inc""... $ac_c" 1>&6
echo "configure:6108: checking for --with-sasl-inc" >&5
echo "configure:6107: checking for --with-sasl-inc" >&5
# Check whether --with-sasl-inc or --without-sasl-inc was given.
if test "${with_sasl_inc+set}" = set; then
withval="$with_sasl_inc"
@@ -6124,7 +6123,7 @@ fi
echo $ac_n "checking for --with-sasl-lib""... $ac_c" 1>&6
echo "configure:6128: checking for --with-sasl-lib" >&5
echo "configure:6127: checking for --with-sasl-lib" >&5
# Check whether --with-sasl-lib or --without-sasl-lib was given.
if test "${with_sasl_lib+set}" = set; then
withval="$with_sasl_lib"
@@ -6167,12 +6166,12 @@ if test -n "$SASL_LIBS" ; then
fi
echo $ac_n "checking for getaddrinfo""... $ac_c" 1>&6
echo "configure:6171: checking for getaddrinfo" >&5
echo "configure:6170: checking for getaddrinfo" >&5
if eval "test \"`echo '$''{'ac_cv_func_getaddrinfo'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 6176 "configure"
#line 6175 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char getaddrinfo(); below. */
@@ -6195,7 +6194,7 @@ getaddrinfo();
; return 0; }
EOF
if { (eval echo configure:6199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:6198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_getaddrinfo=yes"
else
@@ -6214,7 +6213,7 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for getaddrinfo in -lsocket""... $ac_c" 1>&6
echo "configure:6218: checking for getaddrinfo in -lsocket" >&5
echo "configure:6217: checking for getaddrinfo in -lsocket" >&5
ac_lib_var=`echo socket'_'getaddrinfo | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -6222,7 +6221,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
#line 6226 "configure"
#line 6225 "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
@@ -6233,7 +6232,7 @@ int main() {
getaddrinfo()
; return 0; }
EOF
if { (eval echo configure:6237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:6236: \"$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
@@ -6267,7 +6266,7 @@ if test -n "$special_sasl_check_lib" ; then
SAVE_LIBS="$LIBS"
LIBS="/link $SASL_LIBS sasl32.lib"
echo $ac_n "checking for sasl_client_init in -lsasl32""... $ac_c" 1>&6
echo "configure:6271: checking for sasl_client_init in -lsasl32" >&5
echo "configure:6270: checking for sasl_client_init in -lsasl32" >&5
ac_lib_var=`echo sasl32'_'sasl_client_init | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -6275,7 +6274,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lsasl32 $LIBS"
cat > conftest.$ac_ext <<EOF
#line 6279 "configure"
#line 6278 "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
@@ -6286,7 +6285,7 @@ int main() {
sasl_client_init()
; return 0; }
EOF
if { (eval echo configure:6290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:6289: \"$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
@@ -6309,7 +6308,7 @@ fi
if test -z "$sasl_lib" ; then
LIBS="/link $SASL_LIBS libsasl2.lib"
echo $ac_n "checking for sasl_client_init in -lsasl2""... $ac_c" 1>&6
echo "configure:6313: checking for sasl_client_init in -lsasl2" >&5
echo "configure:6312: checking for sasl_client_init in -lsasl2" >&5
ac_lib_var=`echo sasl2'_'sasl_client_init | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -6317,7 +6316,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lsasl2 $LIBS"
cat > conftest.$ac_ext <<EOF
#line 6321 "configure"
#line 6320 "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
@@ -6328,7 +6327,7 @@ int main() {
sasl_client_init()
; return 0; }
EOF
if { (eval echo configure:6332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:6331: \"$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
@@ -6352,7 +6351,7 @@ fi
if test -z "$sasl_lib" ; then
LIBS="/link $SASL_LIBS libsasl.lib"
echo $ac_n "checking for sasl_client_init in -lsasl""... $ac_c" 1>&6
echo "configure:6356: checking for sasl_client_init in -lsasl" >&5
echo "configure:6355: checking for sasl_client_init in -lsasl" >&5
ac_lib_var=`echo sasl'_'sasl_client_init | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -6360,7 +6359,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lsasl $LIBS"
cat > conftest.$ac_ext <<EOF
#line 6364 "configure"
#line 6363 "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
@@ -6371,7 +6370,7 @@ int main() {
sasl_client_init()
; return 0; }
EOF
if { (eval echo configure:6375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:6374: \"$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
@@ -6395,7 +6394,7 @@ fi
LIBS="$SAVE_LIBS"
else
echo $ac_n "checking for sasl_client_init in -lsasl2""... $ac_c" 1>&6
echo "configure:6399: checking for sasl_client_init in -lsasl2" >&5
echo "configure:6398: checking for sasl_client_init in -lsasl2" >&5
ac_lib_var=`echo sasl2'_'sasl_client_init | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -6403,7 +6402,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lsasl2 $LIBS"
cat > conftest.$ac_ext <<EOF
#line 6407 "configure"
#line 6406 "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
@@ -6414,7 +6413,7 @@ int main() {
sasl_client_init()
; return 0; }
EOF
if { (eval echo configure:6418: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:6417: \"$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
@@ -6433,7 +6432,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for sasl_client_init in -lsasl""... $ac_c" 1>&6
echo "configure:6437: checking for sasl_client_init in -lsasl" >&5
echo "configure:6436: checking for sasl_client_init in -lsasl" >&5
ac_lib_var=`echo sasl'_'sasl_client_init | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -6441,7 +6440,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lsasl $LIBS"
cat > conftest.$ac_ext <<EOF
#line 6445 "configure"
#line 6444 "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
@@ -6452,7 +6451,7 @@ int main() {
sasl_client_init()
; return 0; }
EOF
if { (eval echo configure:6456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:6455: \"$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
@@ -6503,7 +6502,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:6507: checking whether ${CC-cc} accepts -pthread" >&5
echo "configure:6506: 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
@@ -6519,7 +6518,7 @@ echo "configure:6507: 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:6523: checking whether ${CC-cc} accepts -pthreads" >&5
echo "configure:6522: 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

View File

@@ -1556,7 +1556,6 @@ tools are selected during the Xcode/Developer Tools installation.])
# Use temp file for windres (bug 213281)
RC="$WINDRES -O coff --use-temp-file"
else
CYGWIN_WRAPPER='sh $(topsrcdir)/config/cygwin-wrapper'
CC=cl
CXX=cl
LD=link
@@ -1571,7 +1570,7 @@ tools are selected during the Xcode/Developer Tools installation.])
AR_FLAGS=
RANLIB='echo not_ranlib'
STRIP='echo not_strip'
RC='$(CYGWIN_WRAPPER) rc.exe'
RC=rc.exe
GARBAGE='$(OBJDIR)/vc20.pdb $(OBJDIR)/vc40.pdb'
OBJ_SUFFIX=obj
LIB_SUFFIX=lib

View File

@@ -179,7 +179,7 @@ endif
# variable definitions for exported symbols
ifeq ($(OS_ARCH), WINNT)
LDAP_EXPORT_DEFS= $(srcdir)/../msdos/winsock/nsldap32.def
LDAP_EXPORT_DEFS= $(WIN_TOP_SRC)/ldap/libraries/msdos/winsock/nsldap32.def
else
ifeq ($(OS_ARCH), OS2)
LDAP_EXPORT_DEFS= $(OBJDIR_NAME)/libldap.def

View File

@@ -86,7 +86,7 @@ endif
# variable definitions for exported symbols
ifeq ($(OS_ARCH), WINNT)
LDIF_EXPORT_DEFS= $(srcdir)/../msdos/winsock/nsldif32.def
LDIF_EXPORT_DEFS= $(WIN_TOP_SRC)/ldap/libraries/msdos/winsock/nsldif32.def
else
ifeq ($(OS_ARCH), OS2)
LDIF_EXPORT_DEFS= $(OBJDIR_NAME)/libldif.def

View File

@@ -96,7 +96,7 @@ endif
# variable definitions for exported symbols
ifeq ($(OS_ARCH), WINNT)
PRLDAP_EXPORT_DEFS= $(srcdir)/../msdos/winsock/nsldappr32.def
PRLDAP_EXPORT_DEFS= $(WIN_TOP_SRC)/ldap/libraries/msdos/winsock/nsldappr32.def
else
ifeq ($(OS_ARCH), OS2)
PRLDAP_EXPORT_DEFS= $(OBJDIR_NAME)/libprldap.def

View File

@@ -95,7 +95,7 @@ endif
# variable definitions for exported symbols
ifeq ($(OS_ARCH), WINNT)
SSLDAP_EXPORT_DEFS= $(srcdir)/../msdos/winsock/nsldapssl32.def
SSLDAP_EXPORT_DEFS= $(WIN_TOP_SRC)/ldap/libraries/msdos/winsock/nsldapssl32.def
else
SSLDAP_EXPORT_DEFS= $(SSLOBJDEST)/libldap_ssl.exp
endif