From 5cac25519de66d00e14177a12bd3f7241b3cc4ff Mon Sep 17 00:00:00 2001 From: "briano%netscape.com" Date: Tue, 9 Feb 1999 23:32:00 +0000 Subject: [PATCH] Automated update --- configure | 244 +++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 167 insertions(+), 77 deletions(-) diff --git a/configure b/configure index 9b140b2280ef..ead846d22851 100755 --- a/configure +++ b/configure @@ -5654,6 +5654,78 @@ else fi CC=$_SAVE_CC +echo $ac_n "checking $CXX for \"-include \" option""... $ac_c" 1>&6 +echo "configure:5659: checking $CXX for \"-include \" option" >&5 +_tmp_header="include-test-$$.h" +echo "char *booboo;" > $_tmp_header +_SAVE_CFLAGS=$CFLAGS ; CFLAGS="$CFLAGS -include $_tmp_header" +_SAVE_CC=$CC ; CC=$CXX +if eval "test \"`echo '$''{'ac_cv_cxx_include_flag'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cxx_include_flag=true +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_cxx_include_flag=false +fi +rm -f conftest* +fi + +if test $ac_cv_cxx_include_flag = true ; then + echo "$ac_t""yes" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi +CC=$_SAVE_CC +echo $ac_n "checking $CC for \"-include \" option""... $ac_c" 1>&6 +echo "configure:5694: checking $CC for \"-include \" option" >&5 +if eval "test \"`echo '$''{'ac_cv_cc_include_flag'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cc_include_flag=true +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_cc_include_flag=false +fi +rm -f conftest* +fi + +if test $ac_cv_cc_include_flag = true ; then + echo "$ac_t""yes" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi +CFLAGS=$_SAVE_CFLAGS +rm -r $_tmp_header +if test $ac_cv_cc_include_flag = true -a $ac_cv_cxx_include_flag = true; then + USE_CPP_INCLUDE_FLAG=1 + +fi + # Mozilla specific options # ======================================================== @@ -6014,7 +6086,7 @@ if test "$no_x" != "yes" ; then _SAVE_LDFLAGS="$LDFLAGS" LDFLAGS="$XLDFLAGS $LDFLAGS" echo $ac_n "checking for XDrawLines in -lX11""... $ac_c" 1>&6 -echo "configure:6018: checking for XDrawLines in -lX11" >&5 +echo "configure:6090: checking for XDrawLines in -lX11" >&5 ac_lib_var=`echo X11'_'XDrawLines | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6022,7 +6094,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lX11 $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6055,7 +6127,7 @@ MISSING_X="$MISSING_X -lX11" fi echo $ac_n "checking for XextAddDisplay in -lXext""... $ac_c" 1>&6 -echo "configure:6059: checking for XextAddDisplay in -lXext" >&5 +echo "configure:6131: checking for XextAddDisplay in -lXext" >&5 ac_lib_var=`echo Xext'_'XextAddDisplay | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6063,7 +6135,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXext $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6096,7 +6168,7 @@ MISSING_X="$MISSING_X -lXext" fi echo $ac_n "checking for IceFlush in -lICE""... $ac_c" 1>&6 -echo "configure:6100: checking for IceFlush in -lICE" >&5 +echo "configure:6172: checking for IceFlush in -lICE" >&5 ac_lib_var=`echo ICE'_'IceFlush | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6104,7 +6176,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lICE $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6191: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6136,7 +6208,7 @@ else fi echo $ac_n "checking for SmcCloseConnection in -lSM""... $ac_c" 1>&6 -echo "configure:6140: checking for SmcCloseConnection in -lSM" >&5 +echo "configure:6212: checking for SmcCloseConnection in -lSM" >&5 ac_lib_var=`echo SM'_'SmcCloseConnection | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6144,7 +6216,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lSM $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6231: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6176,7 +6248,7 @@ else fi echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6 -echo "configure:6180: checking for XtFree in -lXt" >&5 +echo "configure:6252: checking for XtFree in -lXt" >&5 ac_lib_var=`echo Xt'_'XtFree | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6184,7 +6256,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXt $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6271: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6217,7 +6289,7 @@ MISSING_X="$MISSING_X -lXt" fi echo $ac_n "checking for XmuLookupString in -lXmu""... $ac_c" 1>&6 -echo "configure:6221: checking for XmuLookupString in -lXmu" >&5 +echo "configure:6293: checking for XmuLookupString in -lXmu" >&5 ac_lib_var=`echo Xmu'_'XmuLookupString | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6225,7 +6297,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXmu $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6281,7 +6353,7 @@ fi LDFLAGS="$XLDFLAGS $LDFLAGS" if test "$MOTIF_REQUIRES_XPM" = "True" ; then echo $ac_n "checking for XpmWriteFileFromImage in -lXpm""... $ac_c" 1>&6 -echo "configure:6285: checking for XpmWriteFileFromImage in -lXpm" >&5 +echo "configure:6357: checking for XpmWriteFileFromImage in -lXpm" >&5 ac_lib_var=`echo Xpm'_'XpmWriteFileFromImage | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6289,7 +6361,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXpm $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6324,7 +6396,7 @@ fi fi if test "$MOTIF_VERSION" = "2.1" ; then echo $ac_n "checking for XpGetPrinterList in -lXp""... $ac_c" 1>&6 -echo "configure:6328: checking for XpGetPrinterList in -lXp" >&5 +echo "configure:6400: checking for XpGetPrinterList in -lXp" >&5 ac_lib_var=`echo Xp'_'XpGetPrinterList | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6332,7 +6404,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXp $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6401,7 +6473,7 @@ fi _SAVE_LDFLAGS="$LDFLAGS" LDFLAGS="$MOTIF_DYNAMIC_PATHS $XLDFLAGS $LDFLAGS" echo $ac_n "checking for XmStringCreate in -lXm""... $ac_c" 1>&6 -echo "configure:6405: checking for XmStringCreate in -lXm" >&5 +echo "configure:6477: checking for XmStringCreate in -lXm" >&5 ac_lib_var=`echo Xm'_'XmStringCreate | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6409,7 +6481,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXm $MOTIF_DYNAMIC_PATHS $TK_LIBS $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6444,7 +6516,7 @@ fi LDFLAGS="$_SAVE_LDFLAGS" else echo $ac_n "checking for XmStringCreate in -lXm""... $ac_c" 1>&6 -echo "configure:6448: checking for XmStringCreate in -lXm" >&5 +echo "configure:6520: checking for XmStringCreate in -lXm" >&5 ac_lib_var=`echo Xm'_'XmStringCreate | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6452,7 +6524,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXm $TK_LIBS $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6532,7 +6604,7 @@ fi # Extract the first word of "gtk-config", so it can be a program name with args. set dummy gtk-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6536: checking for $ac_word" >&5 +echo "configure:6608: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6563,7 +6635,7 @@ fi min_gtk_version=$GTK_VERSION echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:6567: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:6639: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG" = "no" ; then no_gtk=yes @@ -6586,7 +6658,7 @@ echo "configure:6567: checking for GTK - version >= $min_gtk_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -6664,7 +6736,7 @@ main () } EOF -if { (eval echo configure:6668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -6698,7 +6770,7 @@ fi CFLAGS="$CFLAGS $GTK_CFLAGS" LIBS="$LIBS $GTK_LIBS" cat > conftest.$ac_ext < @@ -6708,7 +6780,7 @@ int main() { return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ; return 0; } EOF -if { (eval echo configure:6712: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding GTK or finding the wrong" @@ -6813,7 +6885,7 @@ if test "$JPEG_DIR" = no; then SYSTEM_JPEG= else echo $ac_n "checking for jpeg_destroy_compress in -ljpeg""... $ac_c" 1>&6 -echo "configure:6817: checking for jpeg_destroy_compress in -ljpeg" >&5 +echo "configure:6889: checking for jpeg_destroy_compress in -ljpeg" >&5 ac_lib_var=`echo jpeg'_'jpeg_destroy_compress | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6821,7 +6893,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ljpeg $JPEG_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6861,7 +6933,7 @@ if test "$SYSTEM_JPEG" = 1 ; then SYSTEM_JPEG= else cat > conftest.$ac_ext < #include @@ -6875,7 +6947,7 @@ else } EOF -if { (eval echo configure:6879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then SYSTEM_JPEG=1 else @@ -6913,16 +6985,16 @@ if test "$ZLIB_DIR" = no; then SYSTEM_ZLIB= else echo $ac_n "checking "for zlib.h"""... $ac_c" 1>&6 -echo "configure:6917: checking "for zlib.h"" >&5 +echo "configure:6989: checking "for zlib.h"" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6998: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* result="yes" SYSTEM_ZLIB=1 else @@ -6936,7 +7008,7 @@ rm -f conftest* fi if test "$SYSTEM_ZLIB" = 1 ; then echo $ac_n "checking for gzread in -lz""... $ac_c" 1>&6 -echo "configure:6940: checking for gzread in -lz" >&5 +echo "configure:7012: checking for gzread in -lz" >&5 ac_lib_var=`echo z'_'gzread | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6944,7 +7016,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lz $ZLIB_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7001,7 +7073,7 @@ if test "$PNG_DIR" = no; then SYSTEM_PNG= else echo $ac_n "checking for png_get_valid in -lpng""... $ac_c" 1>&6 -echo "configure:7005: checking for png_get_valid in -lpng" >&5 +echo "configure:7077: checking for png_get_valid in -lpng" >&5 ac_lib_var=`echo png'_'png_get_valid | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7009,7 +7081,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpng $PNG_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7096: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7048,7 +7120,7 @@ if test "$SYSTEM_PNG" = 1 ; then SYSTEM_PNG= else cat > conftest.$ac_ext < #include @@ -7062,7 +7134,7 @@ else } EOF -if { (eval echo configure:7066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then SYSTEM_PNG=1 else @@ -7106,10 +7178,10 @@ CFLAGS="$CFLAGS -I${FULLCIRCLE_DIR}" LDFLAGS="$LDFLAGS -L${FULLCIRCLE_DIR}" echo $ac_n "checking "for FC_Initialize in -ltalkback"""... $ac_c" 1>&6 -echo "configure:7110: checking "for FC_Initialize in -ltalkback"" >&5; +echo "configure:7182: checking "for FC_Initialize in -ltalkback"" >&5; LIBS="-ltalkback $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* FULLCIRCLE_LIB="-ltalkback $FULLCIRCLE_LIB" result="yes" else @@ -7148,7 +7220,7 @@ if test "${with_pthreads+set}" = set; then withval="$with_pthreads" if test "$withval" = "yes"; then echo $ac_n "checking for pthread_attr_init in -lpthread""... $ac_c" 1>&6 -echo "configure:7152: checking for pthread_attr_init in -lpthread" >&5 +echo "configure:7224: checking for pthread_attr_init in -lpthread" >&5 ac_lib_var=`echo pthread'_'pthread_attr_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 @@ -7156,7 +7228,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7217,13 +7289,13 @@ CFLAGS="$CFLAGS -I${NSPR_DIR}/include" LDFLAGS="$LDFLAGS -L${NSPR_DIR}/lib $NSPR_LIBS" echo $ac_n "checking "for PR_GetCurrentThread in -lnspr21"""... $ac_c" 1>&6 -echo "configure:7221: checking "for PR_GetCurrentThread in -lnspr21"" >&5 +echo "configure:7293: checking "for PR_GetCurrentThread in -lnspr21"" >&5 LIBS="-lnspr21 $NSPR_LIBS $LIBS" if test "$cross_compiling" = yes; then _NSPR_NEEDS_THREAD_LIB=1 result="no" else cat > conftest.$ac_ext < #include @@ -7233,7 +7305,7 @@ else } EOF -if { (eval echo configure:7237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then NSPR_LIBS="-lnspr21 $NSPR_LIBS" result="yes" else @@ -7254,7 +7326,7 @@ LIBS=$_SAVE_LIBS case "$target" in *-*-solaris*) echo $ac_n "checking for pthread_attr_init in -lpthread""... $ac_c" 1>&6 -echo "configure:7258: checking for pthread_attr_init in -lpthread" >&5 +echo "configure:7330: checking for pthread_attr_init in -lpthread" >&5 ac_lib_var=`echo pthread'_'pthread_attr_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 @@ -7262,7 +7334,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7295,7 +7367,7 @@ fi ;; *-*-linux*) echo $ac_n "checking for pthread_attr_init in -lpthread""... $ac_c" 1>&6 -echo "configure:7299: checking for pthread_attr_init in -lpthread" >&5 +echo "configure:7371: checking for pthread_attr_init in -lpthread" >&5 ac_lib_var=`echo pthread'_'pthread_attr_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 @@ -7303,7 +7375,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7337,13 +7409,13 @@ fi esac echo $ac_n "checking "for PR_GetCurrentThread in -lnspr21 with thread lib"""... $ac_c" 1>&6 -echo "configure:7341: checking "for PR_GetCurrentThread in -lnspr21 with thread lib"" >&5 +echo "configure:7413: checking "for PR_GetCurrentThread in -lnspr21 with thread lib"" >&5 LIBS="-lnspr21 $NSPR_LIBS $LIBS" if test "$cross_compiling" = yes; then MISSING_NSPR="$MISSING_NSPR -lnspr21" result="no" else cat > conftest.$ac_ext < #include @@ -7353,7 +7425,7 @@ else } EOF -if { (eval echo configure:7357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then NSPR_LIBS="-lnspr21 $NSPR_LIBS" result="yes" else @@ -7371,7 +7443,7 @@ fi echo $ac_n "checking for PL_CreateOptState in -lplc21""... $ac_c" 1>&6 -echo "configure:7375: checking for PL_CreateOptState in -lplc21" >&5 +echo "configure:7447: checking for PL_CreateOptState in -lplc21" >&5 ac_lib_var=`echo plc21'_'PL_CreateOptState | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7379,7 +7451,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lplc21 $NSPR_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7412,7 +7484,7 @@ MISSING_NSPR="$MISSING_NSPR -lplc21" fi echo $ac_n "checking for PL_GetEvent in -lplds21""... $ac_c" 1>&6 -echo "configure:7416: checking for PL_GetEvent in -lplds21" >&5 +echo "configure:7488: checking for PL_GetEvent in -lplds21" >&5 ac_lib_var=`echo plds21'_'PL_GetEvent | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7420,7 +7492,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lplds21 $NSPR_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7466,7 +7538,7 @@ fi # Extract the first word of "makedepend", so it can be a program name with args. set dummy makedepend; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:7470: checking for $ac_word" >&5 +echo "configure:7542: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_SYSTEM_MAKEDEPEND'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7550,6 +7622,22 @@ if test -n "$MISSING_NSPR" ; then { echo "configure: error: Could not find the following nspr libraries or could not run sample program: $MISSING_NSPR" 1>&2; exit 1; }; fi +# Save the defines header file before autoconf removes it. +# (Do not add AC_DEFINE calls after this line.) +if test "$USE_CPP_INCLUDE_FLAG"; then + CONFIG_DEFS_H=config-defs.h + echo "$ac_t"""creating $CONFIG_DEFS_H"" 1>&6 + cat > $CONFIG_DEFS_H <<\EOF +/* List of defines generated by configure. Included with preprocessor flag, + * -include, to avoid long list of -D defines on the compile command-line. + * Do not edit. + */ +EOF + cat confdefs.h >> $CONFIG_DEFS_H + CONFIG_DEFS_H='$(DEPTH)/'$CONFIG_DEFS_H + +fi + for d in lib modules modules/security; do if test ! -d $d ; then rm -f $d; mkdir $d; fi done @@ -8052,6 +8140,7 @@ s%@GNU_CC@%$GNU_CC%g s%@GNU_CXX@%$GNU_CXX%g s%@ALLOCA@%$ALLOCA%g s%@LIBOBJS@%$LIBOBJS%g +s%@USE_CPP_INCLUDE_FLAG@%$USE_CPP_INCLUDE_FLAG%g s%@OS_TARGET@%$OS_TARGET%g s%@MOZ_TOOLKIT@%$MOZ_TOOLKIT%g s%@MOZ_SECURITY@%$MOZ_SECURITY%g @@ -8104,6 +8193,7 @@ s%@MKSHLIB_UNFORCE_ALL@%$MKSHLIB_UNFORCE_ALL%g s%@DSO_CFLAGS@%$DSO_CFLAGS%g s%@DSO_LDOPTS@%$DSO_LDOPTS%g s%@DLL_SUFFIX@%$DLL_SUFFIX%g +s%@CONFIG_DEFS_H@%$CONFIG_DEFS_H%g CEOF EOF