prevent builtin libtiff from using libjpeg if --without-libjpeg was specified
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49598 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
365
configure
vendored
365
configure
vendored
@@ -1,5 +1,5 @@
|
||||
#! /bin/sh
|
||||
# From configure.in Id: configure.in 49441 2007-10-25 22:43:57Z MW .
|
||||
# From configure.in Id: configure.in 49513 2007-10-29 12:09:59Z VZ .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
|
||||
#
|
||||
@@ -869,6 +869,7 @@ COND_PLATFORM_MACOSX_1_TOOLKIT_X11
|
||||
COND_PLATFORM_MACOSX_1_USE_GUI_1
|
||||
COND_PLATFORM_MACOSX_1_USE_SOVERSION_1
|
||||
COND_PLATFORM_MACOS_1
|
||||
COND_PLATFORM_MAC_1
|
||||
COND_PLATFORM_MSDOS_1
|
||||
COND_PLATFORM_OS2_1
|
||||
COND_PLATFORM_UNIX_0
|
||||
@@ -29161,6 +29162,159 @@ echo "$as_me: WARNING: system png library not found or too old, will use built-i
|
||||
fi
|
||||
|
||||
|
||||
TIFF_LINK=
|
||||
TIFF_PREREQ_LINKS=-lm
|
||||
if test "$wxUSE_LIBTIFF" != "no" ; then
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define wxUSE_LIBTIFF 1
|
||||
_ACEOF
|
||||
|
||||
|
||||
if test "$wxUSE_LIBTIFF" = "sys" -o "$wxUSE_LIBTIFF" = "yes" ; then
|
||||
if test "$wxUSE_LIBJPEG" = "sys"; then
|
||||
TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $JPEG_LINK"
|
||||
fi
|
||||
if test "$wxUSE_ZLIB" = "sys"; then
|
||||
TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $ZLIB_LINK"
|
||||
fi
|
||||
{ echo "$as_me:$LINENO: checking for tiffio.h" >&5
|
||||
echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6; }
|
||||
if test "${ac_cv_header_tiffio_h+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
|
||||
|
||||
|
||||
#include <tiffio.h>
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext
|
||||
if { (ac_try="$ac_compile"
|
||||
case "(($ac_try" in
|
||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||
*) ac_try_echo=$ac_try;;
|
||||
esac
|
||||
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||||
(eval "$ac_compile") 2>conftest.er1
|
||||
ac_status=$?
|
||||
grep -v '^ *+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } && {
|
||||
test -z "$ac_c_werror_flag" ||
|
||||
test ! -s conftest.err
|
||||
} && test -s conftest.$ac_objext; then
|
||||
ac_cv_header_tiffio_h=yes
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
ac_cv_header_tiffio_h=no
|
||||
fi
|
||||
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
fi
|
||||
{ echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5
|
||||
echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6; }
|
||||
if test $ac_cv_header_tiffio_h = yes; then
|
||||
|
||||
{ echo "$as_me:$LINENO: checking for TIFFError in -ltiff" >&5
|
||||
echo $ECHO_N "checking for TIFFError in -ltiff... $ECHO_C" >&6; }
|
||||
if test "${ac_cv_lib_tiff_TIFFError+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
LIBS="-ltiff $TIFF_PREREQ_LINKS $LIBS"
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
|
||||
/* Override any GCC internal prototype to avoid an error.
|
||||
Use char because int might match the return type of a GCC
|
||||
builtin and then its argument prototype would still apply. */
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
#endif
|
||||
char TIFFError ();
|
||||
int
|
||||
main ()
|
||||
{
|
||||
return TIFFError ();
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext conftest$ac_exeext
|
||||
if { (ac_try="$ac_link"
|
||||
case "(($ac_try" in
|
||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||
*) ac_try_echo=$ac_try;;
|
||||
esac
|
||||
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||||
(eval "$ac_link") 2>conftest.er1
|
||||
ac_status=$?
|
||||
grep -v '^ *+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } && {
|
||||
test -z "$ac_c_werror_flag" ||
|
||||
test ! -s conftest.err
|
||||
} && test -s conftest$ac_exeext &&
|
||||
$as_test_x conftest$ac_exeext; then
|
||||
ac_cv_lib_tiff_TIFFError=yes
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
ac_cv_lib_tiff_TIFFError=no
|
||||
fi
|
||||
|
||||
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
LIBS=$ac_check_lib_save_LIBS
|
||||
fi
|
||||
{ echo "$as_me:$LINENO: result: $ac_cv_lib_tiff_TIFFError" >&5
|
||||
echo "${ECHO_T}$ac_cv_lib_tiff_TIFFError" >&6; }
|
||||
if test $ac_cv_lib_tiff_TIFFError = yes; then
|
||||
TIFF_LINK=" -ltiff"
|
||||
fi
|
||||
|
||||
|
||||
fi
|
||||
|
||||
|
||||
|
||||
if test "x$TIFF_LINK" = "x" ; then
|
||||
if test "$wxUSE_LIBTIFF" = "sys" ; then
|
||||
{ { echo "$as_me:$LINENO: error: system tiff library not found! Use --with-libtiff=builtin to use built-in version" >&5
|
||||
echo "$as_me: error: system tiff library not found! Use --with-libtiff=builtin to use built-in version" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
else
|
||||
{ echo "$as_me:$LINENO: WARNING: system tiff library not found, will use built-in instead" >&5
|
||||
echo "$as_me: WARNING: system tiff library not found, will use built-in instead" >&2;}
|
||||
wxUSE_LIBTIFF=builtin
|
||||
fi
|
||||
else
|
||||
wxUSE_LIBTIFF=sys
|
||||
fi
|
||||
fi
|
||||
if test "$wxUSE_LIBTIFF" = "builtin" ; then
|
||||
subdirs="$subdirs src/tiff"
|
||||
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
JPEG_LINK=
|
||||
if test "$wxUSE_LIBJPEG" != "no" ; then
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
@@ -29828,158 +29982,8 @@ fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
TIFF_LINK=
|
||||
TIFF_PREREQ_LINKS=-lm
|
||||
if test "$wxUSE_LIBTIFF" != "no" ; then
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define wxUSE_LIBTIFF 1
|
||||
_ACEOF
|
||||
|
||||
|
||||
if test "$wxUSE_LIBTIFF" = "sys" -o "$wxUSE_LIBTIFF" = "yes" ; then
|
||||
if test "$wxUSE_LIBJPEG" = "sys"; then
|
||||
TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $JPEG_LINK"
|
||||
fi
|
||||
if test "$wxUSE_ZLIB" = "sys"; then
|
||||
TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $ZLIB_LINK"
|
||||
fi
|
||||
{ echo "$as_me:$LINENO: checking for tiffio.h" >&5
|
||||
echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6; }
|
||||
if test "${ac_cv_header_tiffio_h+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
|
||||
|
||||
|
||||
#include <tiffio.h>
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext
|
||||
if { (ac_try="$ac_compile"
|
||||
case "(($ac_try" in
|
||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||
*) ac_try_echo=$ac_try;;
|
||||
esac
|
||||
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||||
(eval "$ac_compile") 2>conftest.er1
|
||||
ac_status=$?
|
||||
grep -v '^ *+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } && {
|
||||
test -z "$ac_c_werror_flag" ||
|
||||
test ! -s conftest.err
|
||||
} && test -s conftest.$ac_objext; then
|
||||
ac_cv_header_tiffio_h=yes
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
ac_cv_header_tiffio_h=no
|
||||
fi
|
||||
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
fi
|
||||
{ echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5
|
||||
echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6; }
|
||||
if test $ac_cv_header_tiffio_h = yes; then
|
||||
|
||||
{ echo "$as_me:$LINENO: checking for TIFFError in -ltiff" >&5
|
||||
echo $ECHO_N "checking for TIFFError in -ltiff... $ECHO_C" >&6; }
|
||||
if test "${ac_cv_lib_tiff_TIFFError+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
LIBS="-ltiff $TIFF_PREREQ_LINKS $LIBS"
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
|
||||
/* Override any GCC internal prototype to avoid an error.
|
||||
Use char because int might match the return type of a GCC
|
||||
builtin and then its argument prototype would still apply. */
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
#endif
|
||||
char TIFFError ();
|
||||
int
|
||||
main ()
|
||||
{
|
||||
return TIFFError ();
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext conftest$ac_exeext
|
||||
if { (ac_try="$ac_link"
|
||||
case "(($ac_try" in
|
||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||
*) ac_try_echo=$ac_try;;
|
||||
esac
|
||||
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||||
(eval "$ac_link") 2>conftest.er1
|
||||
ac_status=$?
|
||||
grep -v '^ *+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } && {
|
||||
test -z "$ac_c_werror_flag" ||
|
||||
test ! -s conftest.err
|
||||
} && test -s conftest$ac_exeext &&
|
||||
$as_test_x conftest$ac_exeext; then
|
||||
ac_cv_lib_tiff_TIFFError=yes
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
ac_cv_lib_tiff_TIFFError=no
|
||||
fi
|
||||
|
||||
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
LIBS=$ac_check_lib_save_LIBS
|
||||
fi
|
||||
{ echo "$as_me:$LINENO: result: $ac_cv_lib_tiff_TIFFError" >&5
|
||||
echo "${ECHO_T}$ac_cv_lib_tiff_TIFFError" >&6; }
|
||||
if test $ac_cv_lib_tiff_TIFFError = yes; then
|
||||
TIFF_LINK=" -ltiff"
|
||||
fi
|
||||
|
||||
|
||||
fi
|
||||
|
||||
|
||||
|
||||
if test "x$TIFF_LINK" = "x" ; then
|
||||
if test "$wxUSE_LIBTIFF" = "sys" ; then
|
||||
{ { echo "$as_me:$LINENO: error: system tiff library not found! Use --with-libtiff=builtin to use built-in version" >&5
|
||||
echo "$as_me: error: system tiff library not found! Use --with-libtiff=builtin to use built-in version" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
else
|
||||
{ echo "$as_me:$LINENO: WARNING: system tiff library not found, will use built-in instead" >&5
|
||||
echo "$as_me: WARNING: system tiff library not found, will use built-in instead" >&2;}
|
||||
wxUSE_LIBTIFF=builtin
|
||||
fi
|
||||
else
|
||||
wxUSE_LIBTIFF=sys
|
||||
fi
|
||||
fi
|
||||
if test "$wxUSE_LIBTIFF" = "builtin" ; then
|
||||
subdirs="$subdirs src/tiff"
|
||||
|
||||
else if test "$wxUSE_LIBTIFF" = "builtin"; then
|
||||
ac_configure_args="$ac_configure_args --disable-jpeg"
|
||||
fi
|
||||
fi
|
||||
|
||||
@@ -51930,6 +51934,11 @@ EOF
|
||||
COND_PLATFORM_MACOS_1=""
|
||||
fi
|
||||
|
||||
COND_PLATFORM_MAC_1="#"
|
||||
if test "x$PLATFORM_MAC" = "x1" ; then
|
||||
COND_PLATFORM_MAC_1=""
|
||||
fi
|
||||
|
||||
COND_PLATFORM_MSDOS_1="#"
|
||||
if test "x$PLATFORM_MSDOS" = "x1" ; then
|
||||
COND_PLATFORM_MSDOS_1=""
|
||||
@@ -53828,6 +53837,7 @@ COND_PLATFORM_MACOSX_1_TOOLKIT_X11!$COND_PLATFORM_MACOSX_1_TOOLKIT_X11$ac_delim
|
||||
COND_PLATFORM_MACOSX_1_USE_GUI_1!$COND_PLATFORM_MACOSX_1_USE_GUI_1$ac_delim
|
||||
COND_PLATFORM_MACOSX_1_USE_SOVERSION_1!$COND_PLATFORM_MACOSX_1_USE_SOVERSION_1$ac_delim
|
||||
COND_PLATFORM_MACOS_1!$COND_PLATFORM_MACOS_1$ac_delim
|
||||
COND_PLATFORM_MAC_1!$COND_PLATFORM_MAC_1$ac_delim
|
||||
COND_PLATFORM_MSDOS_1!$COND_PLATFORM_MSDOS_1$ac_delim
|
||||
COND_PLATFORM_OS2_1!$COND_PLATFORM_OS2_1$ac_delim
|
||||
COND_PLATFORM_UNIX_0!$COND_PLATFORM_UNIX_0$ac_delim
|
||||
@@ -53865,7 +53875,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_GTK_TOOLKIT_V
|
||||
COND_TOOLKIT_GTK_USE_GUI_1!$COND_TOOLKIT_GTK_USE_GUI_1$ac_delim
|
||||
COND_TOOLKIT_MAC!$COND_TOOLKIT_MAC$ac_delim
|
||||
COND_TOOLKIT_MAC_USE_GUI_1!$COND_TOOLKIT_MAC_USE_GUI_1$ac_delim
|
||||
COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0$ac_delim
|
||||
_ACEOF
|
||||
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
|
||||
@@ -53907,6 +53916,7 @@ _ACEOF
|
||||
ac_delim='%!_!# '
|
||||
for ac_last_try in false false false false false :; do
|
||||
cat >conf$$subs.sed <<_ACEOF
|
||||
COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0$ac_delim
|
||||
COND_TOOLKIT_MGL!$COND_TOOLKIT_MGL$ac_delim
|
||||
COND_TOOLKIT_MGL_USE_GUI_1!$COND_TOOLKIT_MGL_USE_GUI_1$ac_delim
|
||||
COND_TOOLKIT_MOTIF!$COND_TOOLKIT_MOTIF$ac_delim
|
||||
@@ -54003,7 +54013,6 @@ GCC!$GCC$ac_delim
|
||||
DLLTOOL!$DLLTOOL$ac_delim
|
||||
CPPUNIT_CONFIG!$CPPUNIT_CONFIG$ac_delim
|
||||
LIBOBJS!$LIBOBJS$ac_delim
|
||||
LTLIBOBJS!$LTLIBOBJS$ac_delim
|
||||
_ACEOF
|
||||
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
|
||||
@@ -54042,6 +54051,50 @@ CEOF$ac_eof
|
||||
_ACEOF
|
||||
|
||||
|
||||
ac_delim='%!_!# '
|
||||
for ac_last_try in false false false false false :; do
|
||||
cat >conf$$subs.sed <<_ACEOF
|
||||
LTLIBOBJS!$LTLIBOBJS$ac_delim
|
||||
_ACEOF
|
||||
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 1; then
|
||||
break
|
||||
elif $ac_last_try; then
|
||||
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
|
||||
echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
else
|
||||
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
|
||||
fi
|
||||
done
|
||||
|
||||
ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
|
||||
if test -n "$ac_eof"; then
|
||||
ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
|
||||
ac_eof=`expr $ac_eof + 1`
|
||||
fi
|
||||
|
||||
cat >>$CONFIG_STATUS <<_ACEOF
|
||||
cat >"\$tmp/subs-5.sed" <<\CEOF$ac_eof
|
||||
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
|
||||
_ACEOF
|
||||
sed '
|
||||
s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
|
||||
s/^/s,@/; s/!/@,|#_!!_#|/
|
||||
:n
|
||||
t n
|
||||
s/'"$ac_delim"'$/,g/; t
|
||||
s/$/\\/; p
|
||||
N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
|
||||
' >>$CONFIG_STATUS <conf$$subs.sed
|
||||
rm -f conf$$subs.sed
|
||||
cat >>$CONFIG_STATUS <<_ACEOF
|
||||
:end
|
||||
s/|#_!!_#|//g
|
||||
CEOF$ac_eof
|
||||
_ACEOF
|
||||
|
||||
|
||||
# VPATH may cause trouble with some makes, so we remove $(srcdir),
|
||||
# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
|
||||
# trailing colons and then remove the whole line if VPATH becomes empty
|
||||
@@ -54285,7 +54338,7 @@ s&@abs_builddir@&$ac_abs_builddir&;t t
|
||||
s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
|
||||
s&@INSTALL@&$ac_INSTALL&;t t
|
||||
$ac_datarootdir_hack
|
||||
" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed -f "$tmp/subs-4.sed" | sed 's/|#_!!_#|//g' >$tmp/out
|
||||
" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed -f "$tmp/subs-4.sed" | sed -f "$tmp/subs-5.sed" >$tmp/out
|
||||
|
||||
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
|
||||
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
|
||||
|
||||
98
configure.in
98
configure.in
@@ -2437,6 +2437,52 @@ if test "$wxUSE_LIBPNG" != "no" ; then
|
||||
fi
|
||||
fi
|
||||
|
||||
dnl ------------------------------------------------------------------------
|
||||
dnl Check for tiff library
|
||||
dnl ------------------------------------------------------------------------
|
||||
|
||||
TIFF_LINK=
|
||||
TIFF_PREREQ_LINKS=-lm
|
||||
if test "$wxUSE_LIBTIFF" != "no" ; then
|
||||
AC_DEFINE(wxUSE_LIBTIFF)
|
||||
|
||||
if test "$wxUSE_LIBTIFF" = "sys" -o "$wxUSE_LIBTIFF" = "yes" ; then
|
||||
dnl libtiff may depend on libjpeg and libz so use them in the test
|
||||
dnl below or it would fail
|
||||
if test "$wxUSE_LIBJPEG" = "sys"; then
|
||||
TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $JPEG_LINK"
|
||||
fi
|
||||
if test "$wxUSE_ZLIB" = "sys"; then
|
||||
TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $ZLIB_LINK"
|
||||
fi
|
||||
AC_CHECK_HEADER(tiffio.h,
|
||||
[
|
||||
AC_CHECK_LIB(tiff, TIFFError,
|
||||
TIFF_LINK=" -ltiff",
|
||||
,
|
||||
$TIFF_PREREQ_LINKS)
|
||||
],
|
||||
[],
|
||||
[ ]
|
||||
)
|
||||
|
||||
if test "x$TIFF_LINK" = "x" ; then
|
||||
if test "$wxUSE_LIBTIFF" = "sys" ; then
|
||||
AC_MSG_ERROR([system tiff library not found! Use --with-libtiff=builtin to use built-in version])
|
||||
else
|
||||
AC_MSG_WARN([system tiff library not found, will use built-in instead])
|
||||
wxUSE_LIBTIFF=builtin
|
||||
fi
|
||||
else
|
||||
dnl we are using the system library
|
||||
wxUSE_LIBTIFF=sys
|
||||
fi
|
||||
fi
|
||||
if test "$wxUSE_LIBTIFF" = "builtin" ; then
|
||||
AC_CONFIG_SUBDIRS([src/tiff])
|
||||
fi
|
||||
fi
|
||||
|
||||
dnl ------------------------------------------------------------------------
|
||||
dnl Check for jpeg library
|
||||
dnl ------------------------------------------------------------------------
|
||||
@@ -2513,51 +2559,15 @@ if test "$wxUSE_LIBJPEG" != "no" ; then
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
dnl ------------------------------------------------------------------------
|
||||
dnl Check for tiff library
|
||||
dnl ------------------------------------------------------------------------
|
||||
|
||||
TIFF_LINK=
|
||||
TIFF_PREREQ_LINKS=-lm
|
||||
if test "$wxUSE_LIBTIFF" != "no" ; then
|
||||
AC_DEFINE(wxUSE_LIBTIFF)
|
||||
|
||||
if test "$wxUSE_LIBTIFF" = "sys" -o "$wxUSE_LIBTIFF" = "yes" ; then
|
||||
dnl libtiff may depend on libjpeg and libz so use them in the test
|
||||
dnl below or it would fail
|
||||
if test "$wxUSE_LIBJPEG" = "sys"; then
|
||||
TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $JPEG_LINK"
|
||||
fi
|
||||
if test "$wxUSE_ZLIB" = "sys"; then
|
||||
TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $ZLIB_LINK"
|
||||
fi
|
||||
AC_CHECK_HEADER(tiffio.h,
|
||||
[
|
||||
AC_CHECK_LIB(tiff, TIFFError,
|
||||
TIFF_LINK=" -ltiff",
|
||||
,
|
||||
$TIFF_PREREQ_LINKS)
|
||||
],
|
||||
[],
|
||||
[ ]
|
||||
)
|
||||
|
||||
if test "x$TIFF_LINK" = "x" ; then
|
||||
if test "$wxUSE_LIBTIFF" = "sys" ; then
|
||||
AC_MSG_ERROR([system tiff library not found! Use --with-libtiff=builtin to use built-in version])
|
||||
else
|
||||
AC_MSG_WARN([system tiff library not found, will use built-in instead])
|
||||
wxUSE_LIBTIFF=builtin
|
||||
fi
|
||||
else
|
||||
dnl we are using the system library
|
||||
wxUSE_LIBTIFF=sys
|
||||
fi
|
||||
fi
|
||||
else dnl wxUSE_LIBJPEG = "no"
|
||||
if test "$wxUSE_LIBTIFF" = "builtin"; then
|
||||
AC_CONFIG_SUBDIRS([src/tiff])
|
||||
dnl we have to prevent the builtin libtiff configure from building the
|
||||
dnl library with JPEG support as this was explicitly disabled by user,
|
||||
dnl but unfortunately it needs --disable-jpeg and not --without-libjpeg
|
||||
dnl (which will be passed to it anyhow as configure passes arguments to
|
||||
dnl the top-level script to all the other ones called recursively), so
|
||||
dnl we need to hack around this
|
||||
ac_configure_args="$ac_configure_args --disable-jpeg"
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
Reference in New Issue
Block a user