зеркало из https://github.com/mozilla/gecko-dev.git
Automated update
This commit is contained in:
Родитель
a96f343923
Коммит
08f92abd06
|
@ -11004,8 +11004,16 @@ test -n "$HOST_MOC" || HOST_MOC=""""
|
|||
_SAVE_LDFLAGS=$LDFLAGS
|
||||
QT_LDFLAGS=-L${QTDIR}/lib
|
||||
LDFLAGS="$LDFLAGS $QT_LDFLAGS"
|
||||
|
||||
ac_ext=C
|
||||
# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
|
||||
ac_cpp='$CXXCPP $CPPFLAGS'
|
||||
ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
|
||||
ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
|
||||
cross_compiling=$ac_cv_prog_cxx_cross
|
||||
|
||||
echo $ac_n "checking for main in -lqt""... $ac_c" 1>&6
|
||||
echo "configure:11009: checking for main in -lqt" >&5
|
||||
echo "configure:11017: checking for main in -lqt" >&5
|
||||
ac_lib_var=`echo qt'_'main | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
@ -11013,14 +11021,14 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lqt $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 11017 "configure"
|
||||
#line 11025 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
main()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:11024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:11032: \"$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
|
||||
|
@ -11039,7 +11047,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 main in -lqt-mt""... $ac_c" 1>&6
|
||||
echo "configure:11043: checking for main in -lqt-mt" >&5
|
||||
echo "configure:11051: checking for main in -lqt-mt" >&5
|
||||
ac_lib_var=`echo qt-mt'_'main | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
@ -11047,14 +11055,14 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lqt-mt $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 11051 "configure"
|
||||
#line 11059 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
main()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:11058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:11066: \"$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
|
||||
|
@ -11083,14 +11091,6 @@ fi
|
|||
MOZ_QT_LDFLAGS=$QT_LIBS
|
||||
MOZ_QT_CFLAGS=$QT_CFLAGS
|
||||
|
||||
ac_ext=C
|
||||
# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
|
||||
ac_cpp='$CXXCPP $CPPFLAGS'
|
||||
ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
|
||||
ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
|
||||
cross_compiling=$ac_cv_prog_cxx_cross
|
||||
|
||||
|
||||
_SAVE_CXXFLAGS=$CXXFLAGS
|
||||
_SAVE_LIBS=$LIBS
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче