regenerated configure from new configure.in
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@943 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
40
configure
vendored
40
configure
vendored
@@ -5977,7 +5977,7 @@ else
|
|||||||
echo "$ac_t""no" 1>&6
|
echo "$ac_t""no" 1>&6
|
||||||
fi
|
fi
|
||||||
|
|
||||||
min_gtk_version=1.0.6
|
min_gtk_version=1.0.4
|
||||||
echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
|
echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
|
||||||
echo "configure:5983: checking for GTK - version >= $min_gtk_version" >&5
|
echo "configure:5983: checking for GTK - version >= $min_gtk_version" >&5
|
||||||
no_gtk=""
|
no_gtk=""
|
||||||
@@ -6041,7 +6041,7 @@ fi
|
|||||||
echo "$ac_t""no" 1>&6
|
echo "$ac_t""no" 1>&6
|
||||||
GTK_CFLAGS=""
|
GTK_CFLAGS=""
|
||||||
GTK_LIBS=""
|
GTK_LIBS=""
|
||||||
{ echo "configure: error: Is gtk-config in path and GTK+ is version 1.0.6?" 1>&2; exit 1; }
|
{ echo "configure: error: Is gtk-config in path and GTK+ is version 1.0.4?" 1>&2; exit 1; }
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
@@ -6581,7 +6581,7 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
echo $ac_n "checking for main in -ldl""... $ac_c" 1>&6
|
echo $ac_n "checking for main in -ldl""... $ac_c" 1>&6
|
||||||
echo "configure:6582: checking for main in -ldl" >&5
|
echo "configure:6585: checking for main in -ldl" >&5
|
||||||
ac_lib_var=`echo dl'_'main | sed 'y%./+-%__p_%'`
|
ac_lib_var=`echo dl'_'main | sed 'y%./+-%__p_%'`
|
||||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||||
echo $ac_n "(cached) $ac_c" 1>&6
|
echo $ac_n "(cached) $ac_c" 1>&6
|
||||||
@@ -6589,14 +6589,14 @@ else
|
|||||||
ac_save_LIBS="$LIBS"
|
ac_save_LIBS="$LIBS"
|
||||||
LIBS="-ldl $LIBS"
|
LIBS="-ldl $LIBS"
|
||||||
cat > conftest.$ac_ext <<EOF
|
cat > conftest.$ac_ext <<EOF
|
||||||
#line 6590 "configure"
|
#line 6593 "configure"
|
||||||
#include "confdefs.h"
|
#include "confdefs.h"
|
||||||
|
|
||||||
int main() {
|
int main() {
|
||||||
main()
|
main()
|
||||||
; return 0; }
|
; return 0; }
|
||||||
EOF
|
EOF
|
||||||
if { (eval echo configure:6597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
if { (eval echo configure:6600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||||
rm -rf conftest*
|
rm -rf conftest*
|
||||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||||
else
|
else
|
||||||
@@ -6626,7 +6626,7 @@ UNIX_THREAD="gtk/threadno.cpp"
|
|||||||
|
|
||||||
|
|
||||||
echo $ac_n "checking "for threads"""... $ac_c" 1>&6
|
echo $ac_n "checking "for threads"""... $ac_c" 1>&6
|
||||||
echo "configure:6627: checking "for threads"" >&5
|
echo "configure:6630: checking "for threads"" >&5
|
||||||
# Check whether --with-threads or --without-threads was given.
|
# Check whether --with-threads or --without-threads was given.
|
||||||
if test "${with_threads+set}" = set; then
|
if test "${with_threads+set}" = set; then
|
||||||
withval="$with_threads"
|
withval="$with_threads"
|
||||||
@@ -6660,7 +6660,7 @@ if test "$wxwxUSE_THREADS" = "1"; then
|
|||||||
|
|
||||||
|
|
||||||
echo $ac_n "checking for pthread_create in -lpthread-0.7""... $ac_c" 1>&6
|
echo $ac_n "checking for pthread_create in -lpthread-0.7""... $ac_c" 1>&6
|
||||||
echo "configure:6661: checking for pthread_create in -lpthread-0.7" >&5
|
echo "configure:6664: checking for pthread_create in -lpthread-0.7" >&5
|
||||||
ac_lib_var=`echo pthread-0.7'_'pthread_create | sed 'y%./+-%__p_%'`
|
ac_lib_var=`echo pthread-0.7'_'pthread_create | sed 'y%./+-%__p_%'`
|
||||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||||
echo $ac_n "(cached) $ac_c" 1>&6
|
echo $ac_n "(cached) $ac_c" 1>&6
|
||||||
@@ -6668,7 +6668,7 @@ else
|
|||||||
ac_save_LIBS="$LIBS"
|
ac_save_LIBS="$LIBS"
|
||||||
LIBS="-lpthread-0.7 $LIBS"
|
LIBS="-lpthread-0.7 $LIBS"
|
||||||
cat > conftest.$ac_ext <<EOF
|
cat > conftest.$ac_ext <<EOF
|
||||||
#line 6669 "configure"
|
#line 6672 "configure"
|
||||||
#include "confdefs.h"
|
#include "confdefs.h"
|
||||||
/* Override any gcc2 internal prototype to avoid an error. */
|
/* Override any gcc2 internal prototype to avoid an error. */
|
||||||
/* We use char because int might match the return type of a gcc2
|
/* We use char because int might match the return type of a gcc2
|
||||||
@@ -6679,7 +6679,7 @@ int main() {
|
|||||||
pthread_create()
|
pthread_create()
|
||||||
; return 0; }
|
; return 0; }
|
||||||
EOF
|
EOF
|
||||||
if { (eval echo configure:6680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
if { (eval echo configure:6683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||||
rm -rf conftest*
|
rm -rf conftest*
|
||||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||||
else
|
else
|
||||||
@@ -6703,17 +6703,17 @@ else
|
|||||||
|
|
||||||
ac_safe=`echo "sys/prctl.h" | sed 'y%./+-%__p_%'`
|
ac_safe=`echo "sys/prctl.h" | sed 'y%./+-%__p_%'`
|
||||||
echo $ac_n "checking for sys/prctl.h""... $ac_c" 1>&6
|
echo $ac_n "checking for sys/prctl.h""... $ac_c" 1>&6
|
||||||
echo "configure:6704: checking for sys/prctl.h" >&5
|
echo "configure:6707: checking for sys/prctl.h" >&5
|
||||||
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
||||||
echo $ac_n "(cached) $ac_c" 1>&6
|
echo $ac_n "(cached) $ac_c" 1>&6
|
||||||
else
|
else
|
||||||
cat > conftest.$ac_ext <<EOF
|
cat > conftest.$ac_ext <<EOF
|
||||||
#line 6709 "configure"
|
#line 6712 "configure"
|
||||||
#include "confdefs.h"
|
#include "confdefs.h"
|
||||||
#include <sys/prctl.h>
|
#include <sys/prctl.h>
|
||||||
EOF
|
EOF
|
||||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||||
{ (eval echo configure:6714: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
{ (eval echo configure:6717: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||||
ac_err=`grep -v '^ *+' conftest.out`
|
ac_err=`grep -v '^ *+' conftest.out`
|
||||||
if test -z "$ac_err"; then
|
if test -z "$ac_err"; then
|
||||||
rm -rf conftest*
|
rm -rf conftest*
|
||||||
@@ -6739,7 +6739,7 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
echo $ac_n "checking for pthread_setcanceltype in -lpthread""... $ac_c" 1>&6
|
echo $ac_n "checking for pthread_setcanceltype in -lpthread""... $ac_c" 1>&6
|
||||||
echo "configure:6740: checking for pthread_setcanceltype in -lpthread" >&5
|
echo "configure:6743: checking for pthread_setcanceltype in -lpthread" >&5
|
||||||
ac_lib_var=`echo pthread'_'pthread_setcanceltype | sed 'y%./+-%__p_%'`
|
ac_lib_var=`echo pthread'_'pthread_setcanceltype | sed 'y%./+-%__p_%'`
|
||||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||||
echo $ac_n "(cached) $ac_c" 1>&6
|
echo $ac_n "(cached) $ac_c" 1>&6
|
||||||
@@ -6747,7 +6747,7 @@ else
|
|||||||
ac_save_LIBS="$LIBS"
|
ac_save_LIBS="$LIBS"
|
||||||
LIBS="-lpthread $LIBS"
|
LIBS="-lpthread $LIBS"
|
||||||
cat > conftest.$ac_ext <<EOF
|
cat > conftest.$ac_ext <<EOF
|
||||||
#line 6748 "configure"
|
#line 6751 "configure"
|
||||||
#include "confdefs.h"
|
#include "confdefs.h"
|
||||||
/* Override any gcc2 internal prototype to avoid an error. */
|
/* Override any gcc2 internal prototype to avoid an error. */
|
||||||
/* We use char because int might match the return type of a gcc2
|
/* We use char because int might match the return type of a gcc2
|
||||||
@@ -6758,7 +6758,7 @@ int main() {
|
|||||||
pthread_setcanceltype()
|
pthread_setcanceltype()
|
||||||
; return 0; }
|
; return 0; }
|
||||||
EOF
|
EOF
|
||||||
if { (eval echo configure:6759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
if { (eval echo configure:6762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||||
rm -rf conftest*
|
rm -rf conftest*
|
||||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||||
else
|
else
|
||||||
@@ -6785,7 +6785,7 @@ fi
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
echo $ac_n "checking for pthread_setcanceltype in -lpthreads""... $ac_c" 1>&6
|
echo $ac_n "checking for pthread_setcanceltype in -lpthreads""... $ac_c" 1>&6
|
||||||
echo "configure:6786: checking for pthread_setcanceltype in -lpthreads" >&5
|
echo "configure:6789: checking for pthread_setcanceltype in -lpthreads" >&5
|
||||||
ac_lib_var=`echo pthreads'_'pthread_setcanceltype | sed 'y%./+-%__p_%'`
|
ac_lib_var=`echo pthreads'_'pthread_setcanceltype | sed 'y%./+-%__p_%'`
|
||||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||||
echo $ac_n "(cached) $ac_c" 1>&6
|
echo $ac_n "(cached) $ac_c" 1>&6
|
||||||
@@ -6793,7 +6793,7 @@ else
|
|||||||
ac_save_LIBS="$LIBS"
|
ac_save_LIBS="$LIBS"
|
||||||
LIBS="-lpthreads $LIBS"
|
LIBS="-lpthreads $LIBS"
|
||||||
cat > conftest.$ac_ext <<EOF
|
cat > conftest.$ac_ext <<EOF
|
||||||
#line 6794 "configure"
|
#line 6797 "configure"
|
||||||
#include "confdefs.h"
|
#include "confdefs.h"
|
||||||
/* Override any gcc2 internal prototype to avoid an error. */
|
/* Override any gcc2 internal prototype to avoid an error. */
|
||||||
/* We use char because int might match the return type of a gcc2
|
/* We use char because int might match the return type of a gcc2
|
||||||
@@ -6804,7 +6804,7 @@ int main() {
|
|||||||
pthread_setcanceltype()
|
pthread_setcanceltype()
|
||||||
; return 0; }
|
; return 0; }
|
||||||
EOF
|
EOF
|
||||||
if { (eval echo configure:6805: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
if { (eval echo configure:6808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||||
rm -rf conftest*
|
rm -rf conftest*
|
||||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||||
else
|
else
|
||||||
@@ -6848,7 +6848,7 @@ OPENGL_LINK=
|
|||||||
|
|
||||||
if test "$wxUSE_OPENGL" = 1; then
|
if test "$wxUSE_OPENGL" = 1; then
|
||||||
echo $ac_n "checking for OpenGL includes""... $ac_c" 1>&6
|
echo $ac_n "checking for OpenGL includes""... $ac_c" 1>&6
|
||||||
echo "configure:6849: checking for OpenGL includes" >&5
|
echo "configure:6852: checking for OpenGL includes" >&5
|
||||||
|
|
||||||
ac_find_includes=
|
ac_find_includes=
|
||||||
for ac_dir in $SEARCH_INCLUDE;
|
for ac_dir in $SEARCH_INCLUDE;
|
||||||
@@ -6863,7 +6863,7 @@ for ac_dir in $SEARCH_INCLUDE;
|
|||||||
OPENGL_INCLUDE="-I$ac_find_includes"
|
OPENGL_INCLUDE="-I$ac_find_includes"
|
||||||
echo "$ac_t""found $ac_find_includes" 1>&6
|
echo "$ac_t""found $ac_find_includes" 1>&6
|
||||||
echo $ac_n "checking for OpenGL library""... $ac_c" 1>&6
|
echo $ac_n "checking for OpenGL library""... $ac_c" 1>&6
|
||||||
echo "configure:6864: checking for OpenGL library" >&5
|
echo "configure:6867: checking for OpenGL library" >&5
|
||||||
|
|
||||||
ac_find_libraries=
|
ac_find_libraries=
|
||||||
for ac_dir in $SEARCH_LIB;
|
for ac_dir in $SEARCH_LIB;
|
||||||
|
Reference in New Issue
Block a user