fixed --with-libjpeg=sys
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10755 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
215
configure
vendored
215
configure
vendored
@@ -14644,36 +14644,43 @@ EOF
|
||||
JPEG_INCLUDE="-I\${top_srcdir}/src/jpeg"
|
||||
else
|
||||
JPEG_LINK=
|
||||
ac_safe=`echo "jpeglib.h" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6
|
||||
echo "configure:14650: checking for jpeglib.h" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
||||
echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6
|
||||
echo "configure:14649: checking for jpeglib.h" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_header_jpeglib_h'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 14655 "configure"
|
||||
#line 14654 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <jpeglib.h>
|
||||
|
||||
#undef HAVE_STDLIB_H
|
||||
#include <stdio.h>
|
||||
#include <jpeglib.h>
|
||||
|
||||
int main() {
|
||||
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:14660: \"$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
|
||||
if { (eval echo configure:14666: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_header_$ac_safe=yes"
|
||||
ac_cv_header_jpeglib_h=yes
|
||||
else
|
||||
echo "$ac_err" >&5
|
||||
echo "configure: failed program was:" >&5
|
||||
cat conftest.$ac_ext >&5
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_header_$ac_safe=no"
|
||||
ac_cv_header_jpeglib_h=no
|
||||
|
||||
fi
|
||||
rm -f conftest*
|
||||
|
||||
fi
|
||||
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6
|
||||
echo "configure:14677: checking for jpeg_read_header in -ljpeg" >&5
|
||||
|
||||
echo "$ac_t""$ac_cv_header_jpeglib_h" 1>&6
|
||||
|
||||
if test "$ac_cv_header_jpeglib_h" = "yes"; then
|
||||
echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6
|
||||
echo "configure:14684: checking for jpeg_read_header in -ljpeg" >&5
|
||||
ac_lib_var=`echo jpeg'_'jpeg_read_header | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@@ -14681,7 +14688,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ljpeg $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 14685 "configure"
|
||||
#line 14692 "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
|
||||
@@ -14692,7 +14699,7 @@ int main() {
|
||||
jpeg_read_header()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:14696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:14703: \"$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
|
||||
@@ -14712,9 +14719,7 @@ else
|
||||
echo "$ac_t""no" 1>&6
|
||||
fi
|
||||
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "x$JPEG_LINK" = "x" ; then
|
||||
{ echo "configure: error: system jpeg library not found! Use --with-libjpeg=yes to use the built-in one" 1>&2; exit 1; }
|
||||
@@ -14734,17 +14739,17 @@ EOF
|
||||
TIFF_LINK=
|
||||
ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6
|
||||
echo "configure:14738: checking for tiffio.h" >&5
|
||||
echo "configure:14743: checking for tiffio.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 14743 "configure"
|
||||
#line 14748 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <tiffio.h>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:14748: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:14753: \"$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*
|
||||
@@ -14761,7 +14766,7 @@ fi
|
||||
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
echo $ac_n "checking for TIFFError in -ltiff""... $ac_c" 1>&6
|
||||
echo "configure:14765: checking for TIFFError in -ltiff" >&5
|
||||
echo "configure:14770: checking for TIFFError in -ltiff" >&5
|
||||
ac_lib_var=`echo tiff'_'TIFFError | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@@ -14769,7 +14774,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ltiff -lm $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 14773 "configure"
|
||||
#line 14778 "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
|
||||
@@ -14780,7 +14785,7 @@ int main() {
|
||||
TIFFError()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:14784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:14789: \"$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
|
||||
@@ -14822,17 +14827,17 @@ EOF
|
||||
FREETYPE_LINK=
|
||||
ac_safe=`echo "freetype.h" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for freetype.h""... $ac_c" 1>&6
|
||||
echo "configure:14826: checking for freetype.h" >&5
|
||||
echo "configure:14831: checking for freetype.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 14831 "configure"
|
||||
#line 14836 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <freetype.h>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:14836: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:14841: \"$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*
|
||||
@@ -14849,7 +14854,7 @@ fi
|
||||
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
echo $ac_n "checking for FT_Render_Glyph in -lfreetype""... $ac_c" 1>&6
|
||||
echo "configure:14853: checking for FT_Render_Glyph in -lfreetype" >&5
|
||||
echo "configure:14858: checking for FT_Render_Glyph in -lfreetype" >&5
|
||||
ac_lib_var=`echo freetype'_'FT_Render_Glyph | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@@ -14857,7 +14862,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lfreetype -lm $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 14861 "configure"
|
||||
#line 14866 "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
|
||||
@@ -14868,7 +14873,7 @@ int main() {
|
||||
FT_Render_Glyph()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:14872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:14877: \"$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
|
||||
@@ -14902,17 +14907,17 @@ fi
|
||||
if test "$wxUSE_OPENGL" = "yes"; then
|
||||
ac_safe=`echo "GL/gl.h" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for GL/gl.h""... $ac_c" 1>&6
|
||||
echo "configure:14906: checking for GL/gl.h" >&5
|
||||
echo "configure:14911: checking for GL/gl.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 14911 "configure"
|
||||
#line 14916 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <GL/gl.h>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:14916: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:14921: \"$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*
|
||||
@@ -14938,7 +14943,7 @@ EOF
|
||||
EOF
|
||||
|
||||
echo $ac_n "checking for glFlush in -lGL""... $ac_c" 1>&6
|
||||
echo "configure:14942: checking for glFlush in -lGL" >&5
|
||||
echo "configure:14947: checking for glFlush in -lGL" >&5
|
||||
ac_lib_var=`echo GL'_'glFlush | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@@ -14946,7 +14951,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lGL $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 14950 "configure"
|
||||
#line 14955 "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
|
||||
@@ -14957,7 +14962,7 @@ int main() {
|
||||
glFlush()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:14961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:14966: \"$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
|
||||
@@ -14979,7 +14984,7 @@ else
|
||||
echo "$ac_t""no" 1>&6
|
||||
|
||||
echo $ac_n "checking for glFlush in -lMesaGL""... $ac_c" 1>&6
|
||||
echo "configure:14983: checking for glFlush in -lMesaGL" >&5
|
||||
echo "configure:14988: checking for glFlush in -lMesaGL" >&5
|
||||
ac_lib_var=`echo MesaGL'_'glFlush | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@@ -14987,7 +14992,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lMesaGL $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 14991 "configure"
|
||||
#line 14996 "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
|
||||
@@ -14998,7 +15003,7 @@ int main() {
|
||||
glFlush()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:15002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:15007: \"$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
|
||||
@@ -15250,12 +15255,12 @@ if test "$wxUSE_DATETIME" = "yes"; then
|
||||
for ac_func in strptime
|
||||
do
|
||||
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
|
||||
echo "configure:15254: checking for $ac_func" >&5
|
||||
echo "configure:15259: 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 15259 "configure"
|
||||
#line 15264 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char $ac_func(); below. */
|
||||
@@ -15278,7 +15283,7 @@ $ac_func();
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:15282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:15287: \"$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
|
||||
@@ -15304,13 +15309,13 @@ done
|
||||
|
||||
|
||||
echo $ac_n "checking for timezone variable in <time.h>""... $ac_c" 1>&6
|
||||
echo "configure:15308: checking for timezone variable in <time.h>" >&5
|
||||
echo "configure:15313: checking for timezone variable in <time.h>" >&5
|
||||
if eval "test \"`echo '$''{'wx_cv_var_timezone'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 15314 "configure"
|
||||
#line 15319 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <time.h>
|
||||
@@ -15322,7 +15327,7 @@ int main() {
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:15326: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:15331: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
|
||||
wx_cv_var_timezone=__timezone
|
||||
@@ -15333,7 +15338,7 @@ else
|
||||
rm -rf conftest*
|
||||
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 15337 "configure"
|
||||
#line 15342 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <time.h>
|
||||
@@ -15345,7 +15350,7 @@ int main() {
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:15349: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:15354: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
|
||||
wx_cv_var_timezone=_timezone
|
||||
@@ -15356,7 +15361,7 @@ else
|
||||
rm -rf conftest*
|
||||
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 15360 "configure"
|
||||
#line 15365 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <time.h>
|
||||
@@ -15368,7 +15373,7 @@ int main() {
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:15372: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:15377: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
|
||||
wx_cv_var_timezone=timezone
|
||||
@@ -15403,12 +15408,12 @@ EOF
|
||||
for ac_func in localtime
|
||||
do
|
||||
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
|
||||
echo "configure:15407: checking for $ac_func" >&5
|
||||
echo "configure:15412: 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 15412 "configure"
|
||||
#line 15417 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char $ac_func(); below. */
|
||||
@@ -15431,7 +15436,7 @@ $ac_func();
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:15435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:15440: \"$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
|
||||
@@ -15458,13 +15463,13 @@ done
|
||||
|
||||
if test "$ac_cv_func_localtime" = "yes"; then
|
||||
echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6
|
||||
echo "configure:15462: checking for tm_gmtoff in struct tm" >&5
|
||||
echo "configure:15467: checking for tm_gmtoff in struct tm" >&5
|
||||
if eval "test \"`echo '$''{'wx_cv_struct_tm_has_gmtoff'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 15468 "configure"
|
||||
#line 15473 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <time.h>
|
||||
@@ -15476,7 +15481,7 @@ int main() {
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:15480: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:15485: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
|
||||
wx_cv_struct_tm_has_gmtoff=yes
|
||||
@@ -15505,12 +15510,12 @@ EOF
|
||||
for ac_func in gettimeofday ftime
|
||||
do
|
||||
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
|
||||
echo "configure:15509: checking for $ac_func" >&5
|
||||
echo "configure:15514: 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 15514 "configure"
|
||||
#line 15519 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char $ac_func(); below. */
|
||||
@@ -15533,7 +15538,7 @@ $ac_func();
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:15537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:15542: \"$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
|
||||
@@ -15560,7 +15565,7 @@ done
|
||||
|
||||
if test "$ac_cv_func_gettimeofday" = "yes"; then
|
||||
echo $ac_n "checking whether gettimeofday takes two arguments""... $ac_c" 1>&6
|
||||
echo "configure:15564: checking whether gettimeofday takes two arguments" >&5
|
||||
echo "configure:15569: checking whether gettimeofday takes two arguments" >&5
|
||||
if eval "test \"`echo '$''{'wx_cv_func_gettimeofday_has_2_args'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@@ -15575,7 +15580,7 @@ cross_compiling=$ac_cv_prog_cxx_cross
|
||||
|
||||
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 15579 "configure"
|
||||
#line 15584 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <sys/time.h>
|
||||
@@ -15589,7 +15594,7 @@ int main() {
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:15593: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:15598: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
wx_cv_func_gettimeofday_has_2_args=yes
|
||||
else
|
||||
@@ -15597,7 +15602,7 @@ else
|
||||
cat conftest.$ac_ext >&5
|
||||
rm -rf conftest*
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 15601 "configure"
|
||||
#line 15606 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <sys/time.h>
|
||||
@@ -15610,7 +15615,7 @@ int main() {
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:15614: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:15619: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
wx_cv_func_gettimeofday_has_2_args=no
|
||||
else
|
||||
@@ -15656,12 +15661,12 @@ if test "$TOOLKIT" != "MSW"; then
|
||||
|
||||
if test "$wxUSE_SOCKETS" = "yes"; then
|
||||
echo $ac_n "checking for socket""... $ac_c" 1>&6
|
||||
echo "configure:15660: checking for socket" >&5
|
||||
echo "configure:15665: checking for socket" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 15665 "configure"
|
||||
#line 15670 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char socket(); below. */
|
||||
@@ -15684,7 +15689,7 @@ socket();
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:15688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:15693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_func_socket=yes"
|
||||
else
|
||||
@@ -15702,7 +15707,7 @@ if eval "test \"`echo '$ac_cv_func_'socket`\" = yes"; then
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
|
||||
echo "configure:15706: checking for socket in -lsocket" >&5
|
||||
echo "configure:15711: checking for socket in -lsocket" >&5
|
||||
ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@@ -15710,7 +15715,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lsocket $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 15714 "configure"
|
||||
#line 15719 "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
|
||||
@@ -15721,7 +15726,7 @@ int main() {
|
||||
socket()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:15725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:15730: \"$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
|
||||
@@ -15754,7 +15759,7 @@ fi
|
||||
|
||||
if test "$wxUSE_SOCKETS" = "yes" ; then
|
||||
echo $ac_n "checking what is the type of the third argument of getsockname""... $ac_c" 1>&6
|
||||
echo "configure:15758: checking what is the type of the third argument of getsockname" >&5
|
||||
echo "configure:15763: checking what is the type of the third argument of getsockname" >&5
|
||||
if eval "test \"`echo '$''{'wx_cv_type_getsockname3'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@@ -15769,7 +15774,7 @@ cross_compiling=$ac_cv_prog_cxx_cross
|
||||
|
||||
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 15773 "configure"
|
||||
#line 15778 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <sys/types.h>
|
||||
@@ -15782,7 +15787,7 @@ int main() {
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:15786: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:15791: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
wx_cv_type_getsockname3=socklen_t
|
||||
else
|
||||
@@ -15790,7 +15795,7 @@ else
|
||||
cat conftest.$ac_ext >&5
|
||||
rm -rf conftest*
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 15794 "configure"
|
||||
#line 15799 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <sys/types.h>
|
||||
@@ -15803,7 +15808,7 @@ int main() {
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:15807: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:15812: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
wx_cv_type_getsockname3=size_t
|
||||
else
|
||||
@@ -15811,7 +15816,7 @@ else
|
||||
cat conftest.$ac_ext >&5
|
||||
rm -rf conftest*
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 15815 "configure"
|
||||
#line 15820 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <sys/types.h>
|
||||
@@ -15824,7 +15829,7 @@ int main() {
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:15828: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:15833: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
wx_cv_type_getsockname3=int
|
||||
else
|
||||
@@ -15886,17 +15891,17 @@ if test "$wxUSE_JOYSTICK" = "yes"; then
|
||||
do
|
||||
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
||||
echo "configure:15890: checking for $ac_hdr" >&5
|
||||
echo "configure:15895: checking for $ac_hdr" >&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 15895 "configure"
|
||||
#line 15900 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <$ac_hdr>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:15900: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:15905: \"$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*
|
||||
@@ -15952,12 +15957,12 @@ if test "$wxUSE_DYNLIB_CLASS" = "yes"; then
|
||||
for ac_func in dlopen
|
||||
do
|
||||
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
|
||||
echo "configure:15956: checking for $ac_func" >&5
|
||||
echo "configure:15961: 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 15961 "configure"
|
||||
#line 15966 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char $ac_func(); below. */
|
||||
@@ -15980,7 +15985,7 @@ $ac_func();
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:15984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:15989: \"$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
|
||||
@@ -16008,7 +16013,7 @@ EOF
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
|
||||
echo "configure:16012: checking for dlopen in -ldl" >&5
|
||||
echo "configure:16017: 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
|
||||
@@ -16016,7 +16021,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ldl $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 16020 "configure"
|
||||
#line 16025 "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
|
||||
@@ -16027,7 +16032,7 @@ int main() {
|
||||
dlopen()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:16031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:16036: \"$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
|
||||
@@ -16056,12 +16061,12 @@ else
|
||||
for ac_func in shl_load
|
||||
do
|
||||
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
|
||||
echo "configure:16060: checking for $ac_func" >&5
|
||||
echo "configure:16065: 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 16065 "configure"
|
||||
#line 16070 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char $ac_func(); below. */
|
||||
@@ -16084,7 +16089,7 @@ $ac_func();
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:16088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:16093: \"$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
|
||||
@@ -16112,7 +16117,7 @@ EOF
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
echo $ac_n "checking for dld in -lshl_load""... $ac_c" 1>&6
|
||||
echo "configure:16116: checking for dld in -lshl_load" >&5
|
||||
echo "configure:16121: checking for dld in -lshl_load" >&5
|
||||
ac_lib_var=`echo shl_load'_'dld | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@@ -16120,7 +16125,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lshl_load $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 16124 "configure"
|
||||
#line 16129 "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
|
||||
@@ -16131,7 +16136,7 @@ int main() {
|
||||
dld()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:16135: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:16140: \"$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
|
||||
@@ -16170,12 +16175,12 @@ done
|
||||
for ac_func in dlerror
|
||||
do
|
||||
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
|
||||
echo "configure:16174: checking for $ac_func" >&5
|
||||
echo "configure:16179: 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 16179 "configure"
|
||||
#line 16184 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char $ac_func(); below. */
|
||||
@@ -16198,7 +16203,7 @@ $ac_func();
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:16202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:16207: \"$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
|
||||
@@ -16223,7 +16228,7 @@ EOF
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
echo $ac_n "checking for dlerror in -ldl""... $ac_c" 1>&6
|
||||
echo "configure:16227: checking for dlerror in -ldl" >&5
|
||||
echo "configure:16232: checking for dlerror in -ldl" >&5
|
||||
ac_lib_var=`echo dl'_'dlerror | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@@ -16231,7 +16236,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ldl $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 16235 "configure"
|
||||
#line 16240 "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
|
||||
@@ -16242,7 +16247,7 @@ int main() {
|
||||
dlerror()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:16246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:16251: \"$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
|
||||
@@ -16482,17 +16487,17 @@ if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then
|
||||
do
|
||||
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
||||
echo "configure:16486: checking for $ac_hdr" >&5
|
||||
echo "configure:16491: checking for $ac_hdr" >&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 16491 "configure"
|
||||
#line 16496 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <$ac_hdr>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:16496: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:16501: \"$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*
|
||||
@@ -17241,7 +17246,7 @@ SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq
|
||||
|
||||
|
||||
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
|
||||
echo "configure:17245: checking whether ${MAKE-make} sets \${MAKE}" >&5
|
||||
echo "configure:17250: checking whether ${MAKE-make} sets \${MAKE}" >&5
|
||||
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
||||
24
configure.in
24
configure.in
@@ -3200,7 +3200,29 @@ if test "$wxUSE_LIBJPEG" = "yes" -o "$wxUSE_LIBJPEG" = "sys" ; then
|
||||
JPEG_INCLUDE="-I\${top_srcdir}/src/jpeg"
|
||||
else
|
||||
JPEG_LINK=
|
||||
AC_CHECK_HEADER(jpeglib.h, AC_CHECK_LIB(jpeg, jpeg_read_header, JPEG_LINK="-ljpeg"))
|
||||
dnl can't use AC_CHECK_HEADER as jconfig.h defines things like
|
||||
dnl HAVE_STDLIB_H which are already defined and this provokes
|
||||
dnl a compiler warning which configure considers as an error...
|
||||
AC_MSG_CHECKING(for jpeglib.h)
|
||||
AC_CACHE_VAL(ac_cv_header_jpeglib_h,
|
||||
AC_TRY_COMPILE(
|
||||
[
|
||||
#undef HAVE_STDLIB_H
|
||||
#include <stdio.h>
|
||||
#include <jpeglib.h>
|
||||
],
|
||||
[
|
||||
],
|
||||
ac_cv_header_jpeglib_h=yes,
|
||||
ac_cv_header_jpeglib_h=no
|
||||
)
|
||||
)
|
||||
AC_MSG_RESULT($ac_cv_header_jpeglib_h)
|
||||
|
||||
if test "$ac_cv_header_jpeglib_h" = "yes"; then
|
||||
AC_CHECK_LIB(jpeg, jpeg_read_header, JPEG_LINK="-ljpeg")
|
||||
fi
|
||||
|
||||
if test "x$JPEG_LINK" = "x" ; then
|
||||
AC_MSG_ERROR(system jpeg library not found! Use --with-libjpeg=yes to use the built-in one)
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user