mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-10 09:19:28 +00:00
Automated update
This commit is contained in:
leaf%mozilla.org
parent
e7b96aa2ed
commit
b77fab5bcc
256
configure
vendored
256
configure
vendored
@ -8828,9 +8828,6 @@ if test -z "$MOZ_NATIVE_NSPR"; then
|
||||
fi
|
||||
|
||||
if test -z "$SKIP_LIBRARY_CHECKS"; then
|
||||
if test -z "$with_system_jpeg" && test "$with_jpeg"; then
|
||||
with_system_jpeg=$with_jpeg
|
||||
fi
|
||||
# Check whether --with-system-jpeg or --without-system-jpeg was given.
|
||||
if test "${with_system_jpeg+set}" = set; then
|
||||
withval="$with_system_jpeg"
|
||||
@ -8849,7 +8846,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:8853: checking for jpeg_destroy_compress in -ljpeg" >&5
|
||||
echo "configure:8850: 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
|
||||
@ -8857,7 +8854,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ljpeg $JPEG_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 8861 "configure"
|
||||
#line 8858 "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
|
||||
@ -8868,7 +8865,7 @@ int main() {
|
||||
jpeg_destroy_compress()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:8872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:8869: \"$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
|
||||
@ -8897,7 +8894,7 @@ if test "$SYSTEM_JPEG" = 1; then
|
||||
SYSTEM_JPEG=
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 8901 "configure"
|
||||
#line 8898 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h>
|
||||
@ -8911,7 +8908,7 @@ else
|
||||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:8915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:8912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
SYSTEM_JPEG=1
|
||||
else
|
||||
@ -8934,9 +8931,6 @@ if test -n "${JPEG_DIR}" -a -d "${JPEG_DIR}" -a "$SYSTEM_JPEG" = 1; then
|
||||
JPEG_LIBS="-L${JPEG_DIR}/lib ${JPEG_LIBS}"
|
||||
fi
|
||||
|
||||
if test -z "$with_system_zlib" && test "$with_zlib"; then
|
||||
with_system_zlib=$with_zlib
|
||||
fi
|
||||
# Check whether --with-system-zlib or --without-system-zlib was given.
|
||||
if test "${with_system_zlib+set}" = set; then
|
||||
withval="$with_system_zlib"
|
||||
@ -8954,16 +8948,16 @@ if test "$ZLIB_DIR" = no; then
|
||||
SYSTEM_ZLIB=
|
||||
else
|
||||
echo $ac_n "checking "for zlib.h"""... $ac_c" 1>&6
|
||||
echo "configure:8958: checking "for zlib.h"" >&5
|
||||
echo "configure:8952: checking "for zlib.h"" >&5
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 8960 "configure"
|
||||
#line 8954 "configure"
|
||||
#include "confdefs.h"
|
||||
#include "zlib.h"
|
||||
int main() {
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:8967: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:8961: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
result="yes" SYSTEM_ZLIB=1
|
||||
else
|
||||
@ -8977,7 +8971,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:8981: checking for gzread in -lz" >&5
|
||||
echo "configure:8975: 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
|
||||
@ -8985,7 +8979,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lz $ZLIB_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 8989 "configure"
|
||||
#line 8983 "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
|
||||
@ -8996,7 +8990,7 @@ int main() {
|
||||
gzread()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:9000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:8994: \"$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
|
||||
@ -9026,9 +9020,6 @@ if test "${ZLIB_DIR}" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then
|
||||
ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}"
|
||||
fi
|
||||
|
||||
if test -z "$with_system_png" && test "$with_png"; then
|
||||
with_system_png=$with_png
|
||||
fi
|
||||
# Check whether --with-system-png or --without-system-png was given.
|
||||
if test "${with_system_png+set}" = set; then
|
||||
withval="$with_system_png"
|
||||
@ -9049,7 +9040,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:9053: checking for png_get_valid in -lpng" >&5
|
||||
echo "configure:9044: 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
|
||||
@ -9057,7 +9048,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lpng $PNG_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 9061 "configure"
|
||||
#line 9052 "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
|
||||
@ -9068,7 +9059,7 @@ int main() {
|
||||
png_get_valid()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:9072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:9063: \"$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
|
||||
@ -9096,7 +9087,7 @@ if test "$SYSTEM_PNG" = 1; then
|
||||
SYSTEM_PNG=
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 9100 "configure"
|
||||
#line 9091 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h>
|
||||
@ -9110,7 +9101,7 @@ else
|
||||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:9114: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:9105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
SYSTEM_PNG=1
|
||||
else
|
||||
@ -9133,9 +9124,6 @@ if test "${PNG_DIR}" -a -d "${PNG_DIR}" -a "$SYSTEM_PNG" = 1; then
|
||||
PNG_LIBS="-L${PNG_DIR}/lib ${PNG_LIBS}"
|
||||
fi
|
||||
|
||||
if test -z "$with_system_mng" && test "$with_mng"; then
|
||||
with_system_mng=$with_mng
|
||||
fi
|
||||
# Check whether --with-system-mng or --without-system-mng was given.
|
||||
if test "${with_system_mng+set}" = set; then
|
||||
withval="$with_system_mng"
|
||||
@ -9156,7 +9144,7 @@ if test "$MNG_DIR" = no; then
|
||||
SYSTEM_MNG=
|
||||
else
|
||||
echo $ac_n "checking for mng_initialize in -lmng""... $ac_c" 1>&6
|
||||
echo "configure:9160: checking for mng_initialize in -lmng" >&5
|
||||
echo "configure:9148: checking for mng_initialize in -lmng" >&5
|
||||
ac_lib_var=`echo mng'_'mng_initialize | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -9164,7 +9152,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lmng $MNG_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 9168 "configure"
|
||||
#line 9156 "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
|
||||
@ -9175,7 +9163,7 @@ int main() {
|
||||
mng_initialize()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:9179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:9167: \"$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
|
||||
@ -9203,7 +9191,7 @@ if test "$SYSTEM_MNG" = 1; then
|
||||
SYSTEM_MNG=
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 9207 "configure"
|
||||
#line 9195 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h>
|
||||
@ -9217,7 +9205,7 @@ else
|
||||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:9221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:9209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
SYSTEM_MNG=1
|
||||
else
|
||||
@ -9244,10 +9232,7 @@ fi # SKIP_LIBRARY_CHECKS
|
||||
|
||||
# Toolkit Options
|
||||
|
||||
if test -z "$enable_default_toolkit" && test "$enable_toolkit"; then
|
||||
enable_default_toolkit=$enable_toolkit
|
||||
fi
|
||||
# Check whether --enable-default-toolkit or --disable-default-toolkit was given.
|
||||
# Check whether --enable-default-toolkit or --disable-default-toolkit was given.
|
||||
if test "${enable_default_toolkit+set}" = set; then
|
||||
enableval="$enable_default_toolkit"
|
||||
_DEFAULT_TOOLKIT=$enableval
|
||||
@ -9277,10 +9262,7 @@ fi
|
||||
fi
|
||||
|
||||
if test "$no_x" != "yes"; then
|
||||
if test -z "$enable_toolkit_gtk" && test "$with_gtk"; then
|
||||
enable_toolkit_gtk=$with_gtk
|
||||
fi
|
||||
# Check whether --enable-toolkit-gtk or --disable-toolkit-gtk was given.
|
||||
# Check whether --enable-toolkit-gtk or --disable-toolkit-gtk was given.
|
||||
if test "${enable_toolkit_gtk+set}" = set; then
|
||||
enableval="$enable_toolkit_gtk"
|
||||
if test "$enableval" = "yes"; then
|
||||
@ -9294,10 +9276,7 @@ fi
|
||||
|
||||
|
||||
|
||||
if test -z "$enable_toolkit_xlib" && test "$with_xlib"; then
|
||||
enable_toolkit_xlib=$with_xlib
|
||||
fi
|
||||
# Check whether --enable-toolkit-xlib or --disable-toolkit-xlib was given.
|
||||
# Check whether --enable-toolkit-xlib or --disable-toolkit-xlib was given.
|
||||
if test "${enable_toolkit_xlib+set}" = set; then
|
||||
enableval="$enable_toolkit_xlib"
|
||||
if test "$enableval" = "yes"; then
|
||||
@ -9310,10 +9289,7 @@ if test "${enable_toolkit_xlib+set}" = set; then
|
||||
fi
|
||||
|
||||
|
||||
if test -z "$enable_toolkit_qt" && test "$with_qt"; then
|
||||
enable_toolkit_qt=$with_qt
|
||||
fi
|
||||
# Check whether --enable-toolkit-qt or --disable-toolkit-qt was given.
|
||||
# Check whether --enable-toolkit-qt or --disable-toolkit-qt was given.
|
||||
if test "${enable_toolkit_qt+set}" = set; then
|
||||
enableval="$enable_toolkit_qt"
|
||||
if test "$enableval" = "yes"; then
|
||||
@ -9446,7 +9422,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:9450: checking for $ac_word" >&5
|
||||
echo "configure:9426: 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
|
||||
@ -9481,7 +9457,7 @@ fi
|
||||
|
||||
min_gtk_version=$GTK_VERSION
|
||||
echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
|
||||
echo "configure:9485: checking for GTK - version >= $min_gtk_version" >&5
|
||||
echo "configure:9461: checking for GTK - version >= $min_gtk_version" >&5
|
||||
no_gtk=""
|
||||
if test "$GTK_CONFIG" = "no" ; then
|
||||
no_gtk=yes
|
||||
@ -9504,7 +9480,7 @@ echo "configure:9485: checking for GTK - version >= $min_gtk_version" >&5
|
||||
echo $ac_n "cross compiling; assumed OK... $ac_c"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 9508 "configure"
|
||||
#line 9484 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <gtk/gtk.h>
|
||||
@ -9582,7 +9558,7 @@ main ()
|
||||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:9586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:9562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
:
|
||||
else
|
||||
@ -9617,7 +9593,7 @@ fi
|
||||
CFLAGS="$CFLAGS $GTK_CFLAGS"
|
||||
LIBS="$LIBS $GTK_LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 9621 "configure"
|
||||
#line 9597 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <gtk/gtk.h>
|
||||
@ -9627,7 +9603,7 @@ int main() {
|
||||
return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version));
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:9631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:9607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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"
|
||||
@ -9669,9 +9645,6 @@ rm -f conftest*
|
||||
MOZ_GLE=
|
||||
MOZ_GLE_LDFLAGS=
|
||||
|
||||
if test -z "$enable_gle_support" && test "$enable_gle"; then
|
||||
enable_gle_support=$enable_gle
|
||||
fi
|
||||
# Check whether --enable-gle or --disable-gle was given.
|
||||
if test "${enable_gle+set}" = set; then
|
||||
enableval="$enable_gle"
|
||||
@ -9750,7 +9723,7 @@ then
|
||||
# Extract the first word of "pkg-config", so it can be a program name with args.
|
||||
set dummy pkg-config; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:9754: checking for $ac_word" >&5
|
||||
echo "configure:9727: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -9795,19 +9768,19 @@ fi
|
||||
echo "*** See http://www.freedesktop.org/software/pkgconfig"
|
||||
else
|
||||
echo $ac_n "checking for gtk+-2.0 >= 1.3.7""... $ac_c" 1>&6
|
||||
echo "configure:9799: checking for gtk+-2.0 >= 1.3.7" >&5
|
||||
echo "configure:9772: checking for gtk+-2.0 >= 1.3.7" >&5
|
||||
|
||||
if $PKG_CONFIG --exists "gtk+-2.0 >= 1.3.7" ; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
succeeded=yes
|
||||
|
||||
echo $ac_n "checking MOZ_GTK2_CFLAGS""... $ac_c" 1>&6
|
||||
echo "configure:9806: checking MOZ_GTK2_CFLAGS" >&5
|
||||
echo "configure:9779: checking MOZ_GTK2_CFLAGS" >&5
|
||||
MOZ_GTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 1.3.7"`
|
||||
echo "$ac_t""$MOZ_GTK2_CFLAGS" 1>&6
|
||||
|
||||
echo $ac_n "checking MOZ_GTK2_LIBS""... $ac_c" 1>&6
|
||||
echo "configure:9811: checking MOZ_GTK2_LIBS" >&5
|
||||
echo "configure:9784: checking MOZ_GTK2_LIBS" >&5
|
||||
MOZ_GTK2_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 1.3.7"`
|
||||
echo "$ac_t""$MOZ_GTK2_LIBS" 1>&6
|
||||
else
|
||||
@ -9862,7 +9835,7 @@ do
|
||||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||
set dummy $ac_prog; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:9866: checking for $ac_word" >&5
|
||||
echo "configure:9839: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_HOST_MOC'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -9948,9 +9921,9 @@ cross_compiling=$ac_cv_prog_cxx_cross
|
||||
LIBS="$LIBS $QT_LIBS"
|
||||
|
||||
echo $ac_n "checking Qt - version >= $QT_VERSION""... $ac_c" 1>&6
|
||||
echo "configure:9952: checking Qt - version >= $QT_VERSION" >&5
|
||||
echo "configure:9925: checking Qt - version >= $QT_VERSION" >&5
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 9954 "configure"
|
||||
#line 9927 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <qglobal.h>
|
||||
int main() {
|
||||
@ -9961,7 +9934,7 @@ int main() {
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:9965: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:9938: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
result="yes"
|
||||
else
|
||||
@ -10055,7 +10028,7 @@ fi
|
||||
|
||||
if test "$MOZ_CALENDAR"; then
|
||||
echo $ac_n "checking for icalproperty_new_location in -lical""... $ac_c" 1>&6
|
||||
echo "configure:10059: checking for icalproperty_new_location in -lical" >&5
|
||||
echo "configure:10032: checking for icalproperty_new_location in -lical" >&5
|
||||
ac_lib_var=`echo ical'_'icalproperty_new_location | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -10063,7 +10036,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lical $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10067 "configure"
|
||||
#line 10040 "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
|
||||
@ -10074,7 +10047,7 @@ int main() {
|
||||
icalproperty_new_location()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:10078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:10051: \"$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
|
||||
@ -10157,7 +10130,7 @@ fi
|
||||
# Extract the first word of "freetype-config", so it can be a program name with args.
|
||||
set dummy freetype-config; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:10161: checking for $ac_word" >&5
|
||||
echo "configure:10134: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_path_FT2_CONFIG'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -10193,7 +10166,7 @@ fi
|
||||
|
||||
min_ft_version=7.0.1
|
||||
echo $ac_n "checking for FreeType - version >= $min_ft_version""... $ac_c" 1>&6
|
||||
echo "configure:10197: checking for FreeType - version >= $min_ft_version" >&5
|
||||
echo "configure:10170: checking for FreeType - version >= $min_ft_version" >&5
|
||||
no_ft=""
|
||||
if test "$FT2_CONFIG" = "no" ; then
|
||||
no_ft=yes
|
||||
@ -10241,7 +10214,7 @@ else
|
||||
echo $ac_n "cross compiling; assumed OK... $ac_c"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10245 "configure"
|
||||
#line 10218 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <ft2build.h>
|
||||
@ -10267,7 +10240,7 @@ main()
|
||||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:10271: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:10244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
:
|
||||
else
|
||||
@ -10320,7 +10293,7 @@ then
|
||||
_SAVE_LDFLAGS="$LDFLAGS"
|
||||
LDFLAGS="$XLDFLAGS $LDFLAGS"
|
||||
echo $ac_n "checking for XpGetPrinterList in -lXp""... $ac_c" 1>&6
|
||||
echo "configure:10324: checking for XpGetPrinterList in -lXp" >&5
|
||||
echo "configure:10297: 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
|
||||
@ -10328,7 +10301,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lXp $XEXT_LIBS $XLIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10332 "configure"
|
||||
#line 10305 "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
|
||||
@ -10339,7 +10312,7 @@ int main() {
|
||||
XpGetPrinterList()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:10343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:10316: \"$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
|
||||
@ -10536,9 +10509,6 @@ fi
|
||||
|
||||
MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT irc xmlterm access-builtin ctl"
|
||||
|
||||
if test -z "$enable_extensions" && test "$with_extensions"; then
|
||||
enable_extensions=$with_extensions
|
||||
fi
|
||||
# Check whether --enable-extensions or --disable-extensions was given.
|
||||
if test "${enable_extensions+set}" = set; then
|
||||
enableval="$enable_extensions"
|
||||
@ -10626,14 +10596,14 @@ if test "$TX_EXE"; then
|
||||
EOF
|
||||
|
||||
echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
|
||||
echo "configure:10630: checking whether byte ordering is bigendian" >&5
|
||||
echo "configure:10600: checking whether byte ordering is bigendian" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
ac_cv_c_bigendian=unknown
|
||||
# See if sys/param.h defines the BYTE_ORDER macro.
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10637 "configure"
|
||||
#line 10607 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <sys/types.h>
|
||||
#include <sys/param.h>
|
||||
@ -10644,11 +10614,11 @@ int main() {
|
||||
#endif
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:10648: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:10618: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
# It does; now see whether it defined to BIG_ENDIAN or not.
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10652 "configure"
|
||||
#line 10622 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <sys/types.h>
|
||||
#include <sys/param.h>
|
||||
@ -10659,7 +10629,7 @@ int main() {
|
||||
#endif
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:10663: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:10633: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_c_bigendian=yes
|
||||
else
|
||||
@ -10679,7 +10649,7 @@ if test "$cross_compiling" = yes; then
|
||||
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10683 "configure"
|
||||
#line 10653 "configure"
|
||||
#include "confdefs.h"
|
||||
main () {
|
||||
/* Are we little or big endian? From Harbison&Steele. */
|
||||
@ -10692,7 +10662,7 @@ main () {
|
||||
exit (u.c[sizeof (long) - 1] == 1);
|
||||
}
|
||||
EOF
|
||||
if { (eval echo configure:10696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:10666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
ac_cv_c_bigendian=no
|
||||
else
|
||||
@ -10740,9 +10710,6 @@ fi
|
||||
|
||||
# Individual module options
|
||||
|
||||
if test -z "$enable_xpcom_lea" && test "$enable_lea"; then
|
||||
enable_xpcom_lea=$enable_lea
|
||||
fi
|
||||
# Check whether --enable-xpcom-lea or --disable-xpcom-lea was given.
|
||||
if test "${enable_xpcom_lea+set}" = set; then
|
||||
enableval="$enable_xpcom_lea"
|
||||
@ -10759,9 +10726,6 @@ EOF
|
||||
fi
|
||||
|
||||
|
||||
if test -z "$enable_js_ultrasparc" && test "$enable_ultrasparc"; then
|
||||
enable_js_ultrasparc=$enable_ultrasparc
|
||||
fi
|
||||
# Check whether --enable-js-ultrasparc or --disable-js-ultrasparc was given.
|
||||
if test "${enable_js_ultrasparc+set}" = set; then
|
||||
enableval="$enable_js_ultrasparc"
|
||||
@ -10909,9 +10873,6 @@ fi
|
||||
|
||||
|
||||
|
||||
if test -z "$enable_debug_modules" && test "$with_debug_modules"; then
|
||||
enable_debug_modules=$with_debug_modules
|
||||
fi
|
||||
# Check whether --enable-debug-modules or --disable-debug-modules was given.
|
||||
if test "${enable_debug_modules+set}" = set; then
|
||||
enableval="$enable_debug_modules"
|
||||
@ -10919,9 +10880,6 @@ if test "${enable_debug_modules+set}" = set; then
|
||||
fi
|
||||
|
||||
|
||||
if test -z "$enable_debugger_info_modules" && test "$with_dbgrinfo_modules"; then
|
||||
enable_debugger_info_modules=$with_dbgrinfo_modules
|
||||
fi
|
||||
MOZ_DBGRINFO_MODULES=
|
||||
# Check whether --enable-debugger-info-modules or --disable-debugger-info-modules was given.
|
||||
if test "${enable_debugger_info_modules+set}" = set; then
|
||||
@ -11119,7 +11077,7 @@ if test "${enable_efence+set}" = set; then
|
||||
enableval="$enable_efence"
|
||||
if test "$enableval" = "yes"; then
|
||||
echo $ac_n "checking for malloc in -lefence""... $ac_c" 1>&6
|
||||
echo "configure:11123: checking for malloc in -lefence" >&5
|
||||
echo "configure:11081: checking for malloc in -lefence" >&5
|
||||
ac_lib_var=`echo efence'_'malloc | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -11127,7 +11085,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lefence $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 11131 "configure"
|
||||
#line 11089 "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
|
||||
@ -11138,7 +11096,7 @@ int main() {
|
||||
malloc()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:11142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:11100: \"$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
|
||||
@ -11173,9 +11131,6 @@ fi
|
||||
fi
|
||||
|
||||
|
||||
if test -z "$enable_strip" && test "$enable_strip_libs"; then
|
||||
enable_strip=$enable_strip_libs
|
||||
fi
|
||||
# Check whether --enable-strip or --disable-strip was given.
|
||||
if test "${enable_strip+set}" = set; then
|
||||
enableval="$enable_strip"
|
||||
@ -11282,9 +11237,6 @@ EOF
|
||||
fi
|
||||
|
||||
|
||||
if test -z "$enable_eazel_profiler_support" && test "$enable_eazel_profiler"; then
|
||||
enable_eazel_profiler_support=$enable_eazel_profiler
|
||||
fi
|
||||
# Check whether --enable-eazel-profiler-support or --disable-eazel-profiler-support was given.
|
||||
if test "${enable_eazel_profiler_support+set}" = set; then
|
||||
enableval="$enable_eazel_profiler_support"
|
||||
@ -11306,9 +11258,6 @@ EOF
|
||||
fi
|
||||
|
||||
|
||||
if test -z "$enable_profile_modules" && test "$with_profile_modules"; then
|
||||
enable_profile_modules=$with_profile_modules
|
||||
fi
|
||||
# Check whether --enable-profile-modules or --disable-profile-modules was given.
|
||||
if test "${enable_profile_modules+set}" = set; then
|
||||
enableval="$enable_profile_modules"
|
||||
@ -11345,7 +11294,7 @@ fi
|
||||
|
||||
if test -z "$SKIP_LIBRARY_CHECKS"; then
|
||||
echo $ac_n "checking for cplus_demangle in -liberty""... $ac_c" 1>&6
|
||||
echo "configure:11349: checking for cplus_demangle in -liberty" >&5
|
||||
echo "configure:11298: checking for cplus_demangle in -liberty" >&5
|
||||
ac_lib_var=`echo iberty'_'cplus_demangle | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -11353,7 +11302,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-liberty "-liberty" $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 11357 "configure"
|
||||
#line 11306 "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
|
||||
@ -11364,7 +11313,7 @@ int main() {
|
||||
cplus_demangle()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:11368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:11317: \"$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
|
||||
@ -11438,9 +11387,6 @@ if test "${enable_xterm_updates+set}" = set; then
|
||||
fi
|
||||
|
||||
|
||||
if test -z "$enable_chrome_format" && test "$enable_chrome"; then
|
||||
enable_chrome_format=$enable_chrome
|
||||
fi
|
||||
# Check whether --enable-chrome-format or --disable-chrome-format was given.
|
||||
if test "${enable_chrome_format+set}" = set; then
|
||||
enableval="$enable_chrome_format"
|
||||
@ -11469,9 +11415,6 @@ EOF
|
||||
fi
|
||||
|
||||
|
||||
if test -z "$with_user_appdir" && test "$enable_homedir"; then
|
||||
with_user_appdir=$enable_homedir
|
||||
fi
|
||||
# Check whether --with-user-appdir or --without-user-appdir was given.
|
||||
if test "${with_user_appdir+set}" = set; then
|
||||
withval="$with_user_appdir"
|
||||
@ -11510,7 +11453,7 @@ if test -z "$SKIP_COMPILER_CHECKS"; then
|
||||
# Compiler Options
|
||||
|
||||
echo $ac_n "checking for gcc -pipe support""... $ac_c" 1>&6
|
||||
echo "configure:11514: checking for gcc -pipe support" >&5
|
||||
echo "configure:11457: checking for gcc -pipe support" >&5
|
||||
if test -n "$GNU_CC" && test -n "$GNU_CXX" && test -n "$GNU_AS"; then
|
||||
echo '#include <stdio.h>' > dummy-hello.c
|
||||
echo 'int main() { printf("Hello World\n"); exit(0); }' >> dummy-hello.c
|
||||
@ -11525,14 +11468,14 @@ if test -n "$GNU_CC" && test -n "$GNU_CXX" && test -n "$GNU_AS"; then
|
||||
_SAVE_CFLAGS=$CFLAGS
|
||||
CFLAGS="$CFLAGS -pipe"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 11529 "configure"
|
||||
#line 11472 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
int main() {
|
||||
printf("Hello World\n");
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:11536: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:11479: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
_res_gcc_pipe="yes"
|
||||
else
|
||||
@ -11581,12 +11524,12 @@ if test "$_PEDANTIC"; then
|
||||
_SAVE_CXXFLAGS=$CXXFLAGS
|
||||
CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-pedantic"
|
||||
echo $ac_n "checking whether C++ compiler has -pedantic long long bug""... $ac_c" 1>&6
|
||||
echo "configure:11585: checking whether C++ compiler has -pedantic long long bug" >&5
|
||||
echo "configure:11528: checking whether C++ compiler has -pedantic long long bug" >&5
|
||||
if test "$cross_compiling" = yes; then
|
||||
result="maybe"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 11590 "configure"
|
||||
#line 11533 "configure"
|
||||
#include "confdefs.h"
|
||||
#ifdef __cplusplus
|
||||
extern "C" void exit(int);
|
||||
@ -11595,7 +11538,7 @@ extern "C" void exit(int);
|
||||
if (sizeof(long long) != 8) { return 1; }
|
||||
return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:11599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:11542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
result="no"
|
||||
else
|
||||
@ -11627,12 +11570,12 @@ fi
|
||||
_SAVE_CXXFLAGS=$CXXFLAGS
|
||||
CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS}"
|
||||
echo $ac_n "checking for correct overload resolution with const and templates""... $ac_c" 1>&6
|
||||
echo "configure:11631: checking for correct overload resolution with const and templates" >&5
|
||||
echo "configure:11574: checking for correct overload resolution with const and templates" >&5
|
||||
if eval "test \"`echo '$''{'ac_nscap_nonconst_opeq_bug'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 11636 "configure"
|
||||
#line 11579 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
template <class T>
|
||||
@ -11662,7 +11605,7 @@ int main() {
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:11666: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:11609: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_nscap_nonconst_opeq_bug="no"
|
||||
else
|
||||
@ -11702,16 +11645,16 @@ if test "$_IGNORE_LONG_LONG_WARNINGS"; then
|
||||
_SAVE_CFLAGS="$CFLAGS"
|
||||
CFLAGS="$CFLAGS ${_COMPILER_PREFIX}-Wno-long-long"
|
||||
echo $ac_n "checking whether compiler supports -Wno-long-long""... $ac_c" 1>&6
|
||||
echo "configure:11706: checking whether compiler supports -Wno-long-long" >&5
|
||||
echo "configure:11649: checking whether compiler supports -Wno-long-long" >&5
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 11708 "configure"
|
||||
#line 11651 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
return(0);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:11715: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:11658: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
_WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} ${_COMPILER_PREFIX}-Wno-long-long"
|
||||
_WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-Wno-long-long"
|
||||
@ -11883,9 +11826,6 @@ if (test -z "$BUILD_SHARED_LIBS" && test -z "$BUILD_STATIC_LIBS") ||
|
||||
{ echo "configure: error: Only one of --enable-shared or --enable-static must be specified." 1>&2; exit 1; }
|
||||
fi
|
||||
|
||||
if test -z "$enable_meta_component_modules" && test "$enable_static_components"; then
|
||||
enable_meta_component_modules=$enable_static_components
|
||||
fi
|
||||
# Check whether --enable-meta-component-modules or --disable-meta-component-modules was given.
|
||||
if test "${enable_meta_component_modules+set}" = set; then
|
||||
enableval="$enable_meta_component_modules"
|
||||
@ -11917,7 +11857,7 @@ case "$target" in
|
||||
# Extract the first word of "makeC++SharedLib_r", so it can be a program name with args.
|
||||
set dummy makeC++SharedLib_r; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:11921: checking for $ac_word" >&5
|
||||
echo "configure:11861: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_path_AIX_SHLIB_BIN'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -11981,10 +11921,6 @@ if test "${enable_standalone_modules+set}" = set; then
|
||||
fi
|
||||
|
||||
|
||||
if test "${BUILD_MODULES}" = "all" && test -n "$enable_modules"; then
|
||||
BUILD_MODULES=`echo $enable_modules | sed 's/,/ /g'`
|
||||
fi
|
||||
|
||||
if test "$BUILD_MODULES" != "all" &&
|
||||
test `echo "$BUILD_MODULES" | grep -c ldap` = 0 &&
|
||||
test "$enable_ldap" != "yes"; then
|
||||
@ -12105,7 +12041,7 @@ fi
|
||||
# Extract the first word of "glib-config", so it can be a program name with args.
|
||||
set dummy glib-config; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:12109: checking for $ac_word" >&5
|
||||
echo "configure:12045: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -12140,7 +12076,7 @@ fi
|
||||
|
||||
min_glib_version=1.2.0
|
||||
echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
|
||||
echo "configure:12144: checking for GLIB - version >= $min_glib_version" >&5
|
||||
echo "configure:12080: checking for GLIB - version >= $min_glib_version" >&5
|
||||
no_glib=""
|
||||
if test "$GLIB_CONFIG" = "no" ; then
|
||||
no_glib=yes
|
||||
@ -12163,7 +12099,7 @@ echo "configure:12144: checking for GLIB - version >= $min_glib_version" >&5
|
||||
echo $ac_n "cross compiling; assumed OK... $ac_c"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12167 "configure"
|
||||
#line 12103 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <glib.h>
|
||||
@ -12239,7 +12175,7 @@ main ()
|
||||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:12243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:12179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
:
|
||||
else
|
||||
@ -12273,7 +12209,7 @@ fi
|
||||
CFLAGS="$CFLAGS $GLIB_CFLAGS"
|
||||
LIBS="$LIBS $GLIB_LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12277 "configure"
|
||||
#line 12213 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <glib.h>
|
||||
@ -12283,7 +12219,7 @@ int main() {
|
||||
return ((glib_major_version) || (glib_minor_version) || (glib_micro_version));
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:12287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:12223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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 GLIB or finding the wrong"
|
||||
@ -12327,7 +12263,7 @@ rm -f conftest*
|
||||
# Extract the first word of "libIDL-config", so it can be a program name with args.
|
||||
set dummy libIDL-config; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:12331: checking for $ac_word" >&5
|
||||
echo "configure:12267: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_path_LIBIDL_CONFIG'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -12362,7 +12298,7 @@ fi
|
||||
|
||||
min_libIDL_version=$LIBIDL_VERSION
|
||||
echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6
|
||||
echo "configure:12366: checking for libIDL - version >= $min_libIDL_version" >&5
|
||||
echo "configure:12302: checking for libIDL - version >= $min_libIDL_version" >&5
|
||||
no_libIDL=""
|
||||
if test "$LIBIDL_CONFIG" = "no" ; then
|
||||
no_libIDL=yes
|
||||
@ -12389,7 +12325,7 @@ echo "configure:12366: checking for libIDL - version >= $min_libIDL_version" >&5
|
||||
echo $ac_n "cross compiling; assumed OK... $ac_c"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12393 "configure"
|
||||
#line 12329 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <stdio.h>
|
||||
@ -12475,7 +12411,7 @@ main ()
|
||||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:12479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:12415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
:
|
||||
else
|
||||
@ -12509,7 +12445,7 @@ fi
|
||||
CFLAGS="$CFLAGS $LIBIDL_CFLAGS"
|
||||
LIBS="$LIBS $LIBIDL_LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12513 "configure"
|
||||
#line 12449 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <stdio.h>
|
||||
@ -12520,7 +12456,7 @@ int main() {
|
||||
return IDL_get_libver_string ? 1 : 0;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:12524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:12460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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 libIDL or finding the wrong"
|
||||
@ -12559,7 +12495,7 @@ do
|
||||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||
set dummy $ac_prog; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:12563: checking for $ac_word" >&5
|
||||
echo "configure:12499: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_path_ORBIT_CONFIG'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -12685,7 +12621,7 @@ fi
|
||||
# Extract the first word of "glib-config", so it can be a program name with args.
|
||||
set dummy glib-config; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:12689: checking for $ac_word" >&5
|
||||
echo "configure:12625: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -12720,7 +12656,7 @@ fi
|
||||
|
||||
min_glib_version=${GLIB_VERSION}
|
||||
echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
|
||||
echo "configure:12724: checking for GLIB - version >= $min_glib_version" >&5
|
||||
echo "configure:12660: checking for GLIB - version >= $min_glib_version" >&5
|
||||
no_glib=""
|
||||
if test "$GLIB_CONFIG" = "no" ; then
|
||||
no_glib=yes
|
||||
@ -12743,7 +12679,7 @@ echo "configure:12724: checking for GLIB - version >= $min_glib_version" >&5
|
||||
echo $ac_n "cross compiling; assumed OK... $ac_c"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12747 "configure"
|
||||
#line 12683 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <glib.h>
|
||||
@ -12819,7 +12755,7 @@ main ()
|
||||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:12823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:12759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
:
|
||||
else
|
||||
@ -12853,7 +12789,7 @@ fi
|
||||
CFLAGS="$CFLAGS $GLIB_CFLAGS"
|
||||
LIBS="$LIBS $GLIB_LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12857 "configure"
|
||||
#line 12793 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <glib.h>
|
||||
@ -12863,7 +12799,7 @@ int main() {
|
||||
return ((glib_major_version) || (glib_minor_version) || (glib_micro_version));
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:12867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:12803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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 GLIB or finding the wrong"
|
||||
@ -12915,14 +12851,14 @@ fi
|
||||
_SAVE_CFLAGS=$CFLAGS
|
||||
CFLAGS="$CFLAGS $GLIB_CFLAGS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12919 "configure"
|
||||
#line 12855 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <gmodule.h>
|
||||
int main() {
|
||||
int x = 1; x++;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:12926: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:12862: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
:
|
||||
else
|
||||
echo "configure: failed program was:" >&5
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user