gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2026-01-04 12:54:20 +01:00
Code Issues Projects Releases Wiki Activity

Update for 0.52.0. This is a test version, which brings the Appearance

Browse Source 
section to WPrefs for testing purposes.
This commit is contained in:
dan
1999-03-14 22:35:50 +00:00
parent ea5d3bcde3
commit c56756dc73
50 changed files with 2255 additions and 1007 deletions
Download Patch File Download Diff File Expand all files Collapse all files

123
configure vendored
View File

@@ -751,7 +751,7 @@ fi
PACKAGE=WindowMaker
VERSION=0.51.2
VERSION=0.52.0
if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
{ echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -3939,7 +3939,10 @@ fi
# Check whether --enable-modelock or --disable-modelock was given.
if test "${enable_modelock+set}" = set; then
enableval="$enable_modelock"
X_CFLAGS="$X_CFLAGS -DXKB_MODELOCK"
cat >> confdefs.h <<\EOF
#define XKB_MODELOCK 1
EOF
fi
@@ -3959,7 +3962,7 @@ added_xext=no
if test "$shape" = yes; then
echo $ac_n "checking for XShapeSelectInput in -lXext""... $ac_c" 1>&6
echo "configure:3963: checking for XShapeSelectInput in -lXext" >&5
echo "configure:3966: checking for XShapeSelectInput in -lXext" >&5
ac_lib_var=`echo Xext'_'XShapeSelectInput | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3967,7 +3970,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lXext $XLFLAGS $XLIBS $LIBS"
cat > conftest.$ac_ext <<EOF
#line 3971 "configure"
#line 3974 "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
@@ -3978,7 +3981,7 @@ int main() {
XShapeSelectInput()
; return 0; }
EOF
if { (eval echo configure:3982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:3985: \"$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
@@ -4019,7 +4022,7 @@ fi
if test "$shm" = yes; then
echo $ac_n "checking for XShmAttach in -lXext""... $ac_c" 1>&6
echo "configure:4023: checking for XShmAttach in -lXext" >&5
echo "configure:4026: checking for XShmAttach in -lXext" >&5
ac_lib_var=`echo Xext'_'XShmAttach | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4027,7 +4030,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lXext $XLFLAGS $XLIBS $LIBS"
cat > conftest.$ac_ext <<EOF
#line 4031 "configure"
#line 4034 "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
@@ -4038,7 +4041,7 @@ int main() {
XShmAttach()
; return 0; }
EOF
if { (eval echo configure:4042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:4045: \"$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
@@ -4062,12 +4065,12 @@ fi
if test "$ok" = yes; then
echo $ac_n "checking for shmget""... $ac_c" 1>&6
echo "configure:4066: checking for shmget" >&5
echo "configure:4069: checking for shmget" >&5
if eval "test \"`echo '$''{'ac_cv_func_shmget'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 4071 "configure"
#line 4074 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char shmget(); below. */
@@ -4090,7 +4093,7 @@ shmget();
; return 0; }
EOF
if { (eval echo configure:4094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:4097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_shmget=yes"
else
@@ -4139,7 +4142,7 @@ LIBPL=""
LDFLAGS_old="$LDFLAGS"
LDFLAGS="$LDFLAGS $lib_search_path"
echo $ac_n "checking for PLGetString in -lPropList""... $ac_c" 1>&6
echo "configure:4143: checking for PLGetString in -lPropList" >&5
echo "configure:4146: checking for PLGetString in -lPropList" >&5
ac_lib_var=`echo PropList'_'PLGetString | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4147,7 +4150,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lPropList $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
#line 4151 "configure"
#line 4154 "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
@@ -4158,7 +4161,7 @@ int main() {
PLGetString()
; return 0; }
EOF
if { (eval echo configure:4162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:4165: \"$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
@@ -4187,17 +4190,17 @@ CPPFLAGS_old="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $inc_search_path"
ac_safe=`echo "proplist.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for proplist.h""... $ac_c" 1>&6
echo "configure:4191: checking for proplist.h" >&5
echo "configure:4194: checking for proplist.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 4196 "configure"
#line 4199 "configure"
#include "confdefs.h"
#include <proplist.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:4201: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:4204: \"$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*
@@ -4265,7 +4268,7 @@ if test "$xpm" = yes; then
LDFLAGS_old="$LDFLAGS"
LDFLAGS="$LDFLAGS $lib_search_path"
echo $ac_n "checking for XpmCreatePixmapFromData in -lXpm""... $ac_c" 1>&6
echo "configure:4269: checking for XpmCreatePixmapFromData in -lXpm" >&5
echo "configure:4272: checking for XpmCreatePixmapFromData in -lXpm" >&5
ac_lib_var=`echo Xpm'_'XpmCreatePixmapFromData | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4273,7 +4276,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lXpm $XLFLAGS $XLIBS $LIBS"
cat > conftest.$ac_ext <<EOF
#line 4277 "configure"
#line 4280 "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
@@ -4284,7 +4287,7 @@ int main() {
XpmCreatePixmapFromData()
; return 0; }
EOF
if { (eval echo configure:4288: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:4291: \"$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
@@ -4314,17 +4317,17 @@ CPPFLAGS_old="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $inc_search_path"
ac_safe=`echo "X11/xpm.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for X11/xpm.h""... $ac_c" 1>&6
echo "configure:4318: checking for X11/xpm.h" >&5
echo "configure:4321: checking for X11/xpm.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 4323 "configure"
#line 4326 "configure"
#include "confdefs.h"
#include <X11/xpm.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:4328: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:4331: \"$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*
@@ -4386,7 +4389,7 @@ if test "$png" = yes ; then
LDFLAGS_old="$LDFLAGS"
LDFLAGS="$LDFLAGS $lib_search_path"
echo $ac_n "checking for png_get_valid in -lpng""... $ac_c" 1>&6
echo "configure:4390: checking for png_get_valid in -lpng" >&5
echo "configure:4393: 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
@@ -4394,7 +4397,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lpng -lz -lm $LIBS"
cat > conftest.$ac_ext <<EOF
#line 4398 "configure"
#line 4401 "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
@@ -4405,7 +4408,7 @@ int main() {
png_get_valid()
; return 0; }
EOF
if { (eval echo configure:4409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:4412: \"$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
@@ -4435,17 +4438,17 @@ CPPFLAGS_old="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $inc_search_path"
ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for png.h""... $ac_c" 1>&6
echo "configure:4439: checking for png.h" >&5
echo "configure:4442: checking for png.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 4444 "configure"
#line 4447 "configure"
#include "confdefs.h"
#include <png.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:4449: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:4452: \"$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*
@@ -4481,6 +4484,7 @@ fi
jpeg=yes
ljpeg=""
# Check whether --enable-jpeg or --disable-jpeg was given.
if test "${enable_jpeg+set}" = set; then
enableval="$enable_jpeg"
@@ -4495,7 +4499,7 @@ if test "$jpeg" = yes; then
LDFLAGS_old="$LDFLAGS"
LDFLAGS="$LDFLAGS $lib_search_path"
echo $ac_n "checking for jpeg_destroy_compress in -ljpeg""... $ac_c" 1>&6
echo "configure:4499: checking for jpeg_destroy_compress in -ljpeg" >&5
echo "configure:4503: 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
@@ -4503,7 +4507,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ljpeg $LIBS"
cat > conftest.$ac_ext <<EOF
#line 4507 "configure"
#line 4511 "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
@@ -4514,7 +4518,7 @@ int main() {
jpeg_destroy_compress()
; return 0; }
EOF
if { (eval echo configure:4518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:4522: \"$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
@@ -4539,22 +4543,25 @@ LDFLAGS="$LDFLAGS_old"
if test "x$ac_cv_lib_jpeg_jpeg_destroy_compress" = xyes; then
ljpeg="-ljpeg"
CPPFLAGS_old="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $inc_search_path"
ac_safe=`echo "jpeglib.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6
echo "configure:4548: checking for jpeglib.h" >&5
echo "configure:4555: checking for jpeglib.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 4553 "configure"
#line 4560 "configure"
#include "confdefs.h"
#include <jpeglib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:4558: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:4565: \"$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*
@@ -4605,7 +4612,7 @@ if test "$gif" = yes; then
LDFLAGS_old="$LDFLAGS"
LDFLAGS="$LDFLAGS $lib_search_path"
echo $ac_n "checking for DGifOpenFileName in -lungif""... $ac_c" 1>&6
echo "configure:4609: checking for DGifOpenFileName in -lungif" >&5
echo "configure:4616: checking for DGifOpenFileName in -lungif" >&5
ac_lib_var=`echo ungif'_'DGifOpenFileName | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4613,7 +4620,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lungif $XLFLAGS $XLIBS $LIBS"
cat > conftest.$ac_ext <<EOF
#line 4617 "configure"
#line 4624 "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
@@ -4624,7 +4631,7 @@ int main() {
DGifOpenFileName()
; return 0; }
EOF
if { (eval echo configure:4628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:4635: \"$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
@@ -4655,7 +4662,7 @@ LDFLAGS="$LDFLAGS_old"
LDFLAGS_old="$LDFLAGS"
LDFLAGS="$LDFLAGS $lib_search_path"
echo $ac_n "checking for DGifOpenFileName in -lgif""... $ac_c" 1>&6
echo "configure:4659: checking for DGifOpenFileName in -lgif" >&5
echo "configure:4666: checking for DGifOpenFileName in -lgif" >&5
ac_lib_var=`echo gif'_'DGifOpenFileName | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4663,7 +4670,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lgif $XLFLAGS $XLIBS $LIBS"
cat > conftest.$ac_ext <<EOF
#line 4667 "configure"
#line 4674 "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
@@ -4674,7 +4681,7 @@ int main() {
DGifOpenFileName()
; return 0; }
EOF
if { (eval echo configure:4678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:4685: \"$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
@@ -4708,17 +4715,17 @@ CPPFLAGS_old="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $inc_search_path"
ac_safe=`echo "gif_lib.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for gif_lib.h""... $ac_c" 1>&6
echo "configure:4712: checking for gif_lib.h" >&5
echo "configure:4719: checking for gif_lib.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 4717 "configure"
#line 4724 "configure"
#include "confdefs.h"
#include <gif_lib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:4722: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:4729: \"$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*
@@ -4779,7 +4786,7 @@ if test "$tif" = yes; then
LDFLAGS_old="$LDFLAGS"
LDFLAGS="$LDFLAGS $lib_search_path"
echo $ac_n "checking for TIFFGetVersion in -ltiff""... $ac_c" 1>&6
echo "configure:4783: checking for TIFFGetVersion in -ltiff" >&5
echo "configure:4790: checking for TIFFGetVersion in -ltiff" >&5
ac_lib_var=`echo tiff'_'TIFFGetVersion | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4787,7 +4794,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ltiff -lm $LIBS"
cat > conftest.$ac_ext <<EOF
#line 4791 "configure"
#line 4798 "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
@@ -4798,7 +4805,7 @@ int main() {
TIFFGetVersion()
; return 0; }
EOF
if { (eval echo configure:4802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:4809: \"$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
@@ -4830,15 +4837,15 @@ LDFLAGS="$LDFLAGS_old"
LDFLAGS_old="$LDFLAGS"
LDFLAGS="$LDFLAGS $lib_search_path"
echo $ac_n "checking for TIFFGetVersion in -ltiff""... $ac_c" 1>&6
echo "configure:4834: checking for TIFFGetVersion in -ltiff" >&5
echo "configure:4841: checking for TIFFGetVersion in -ltiff" >&5
ac_lib_var=`echo tiff'_'TIFFGetVersion | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
LIBS="-ltiff -lz -lm $LIBS"
LIBS="-ltiff $ljpeg -lz -lm $LIBS"
cat > conftest.$ac_ext <<EOF
#line 4842 "configure"
#line 4849 "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
@@ -4849,7 +4856,7 @@ int main() {
TIFFGetVersion()
; return 0; }
EOF
if { (eval echo configure:4853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:4860: \"$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
@@ -4882,15 +4889,15 @@ LDFLAGS="$LDFLAGS_old"
LDFLAGS_old="$LDFLAGS"
LDFLAGS="$LDFLAGS $lib_search_path"
echo $ac_n "checking for TIFFGetVersion in -ltiff34""... $ac_c" 1>&6
echo "configure:4886: checking for TIFFGetVersion in -ltiff34" >&5
echo "configure:4893: checking for TIFFGetVersion in -ltiff34" >&5
ac_lib_var=`echo tiff34'_'TIFFGetVersion | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
LIBS="-ltiff34 -lm $LIBS"
LIBS="-ltiff34 $ljpeg -lm $LIBS"
cat > conftest.$ac_ext <<EOF
#line 4894 "configure"
#line 4901 "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
@@ -4901,7 +4908,7 @@ int main() {
TIFFGetVersion()
; return 0; }
EOF
if { (eval echo configure:4905: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:4912: \"$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
@@ -4936,17 +4943,17 @@ CPPFLAGS_old="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $inc_search_path"
ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6
echo "configure:4940: checking for tiffio.h" >&5
echo "configure:4947: 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 4945 "configure"
#line 4952 "configure"
#include "confdefs.h"
#include <tiffio.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:4950: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:4957: \"$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*