From 190ca89cfcbf7093f55b6532a325de1e57d82a75 Mon Sep 17 00:00:00 2001 From: kramm Date: Sat, 27 Oct 2001 14:33:56 +0000 Subject: [PATCH] Generated from configure.in --- configure | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 1e3bbdc..b9b0c69 100755 --- a/configure +++ b/configure @@ -1388,14 +1388,14 @@ echo "Error: The zlib compression library is required." fi - echo $ac_n "checking for jpeg_write_raw_data in -ljpeg""... $ac_c" 1>&6 -echo "configure:1393: checking for jpeg_write_raw_data in -ljpeg" >&5 -ac_lib_var=`echo jpeg'_'jpeg_write_raw_data | sed 'y%./+-%__p_%'` + echo $ac_n "checking for jpeg_write_raw_data in -lxjpeg""... $ac_c" 1>&6 +echo "configure:1393: checking for jpeg_write_raw_data in -lxjpeg" >&5 +ac_lib_var=`echo xjpeg'_'jpeg_write_raw_data | 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="-ljpeg $LIBS" +LIBS="-lxjpeg $LIBS" cat > conftest.$ac_ext <&6 - ac_tr_lib=HAVE_LIB`echo jpeg | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + ac_tr_lib=HAVE_LIB`echo xjpeg | sed -e 's/[^a-zA-Z0-9_]/_/g' \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` cat >> confdefs.h <&6 @@ -2793,21 +2793,25 @@ fi done +export JPEG2SWF='jpeg2swf$(EXEEXT)' if test "x${DISABLEPDF2SWF}" = "xtrue"; then echo "***************************************************" echo "The following headers/libraries are missing: " ${MISSINGLIBS} echo "Disabling pdf2swf tool..." rm pdf2swf/Makefile echo all: > pdf2swf/Makefile + echo install: >> pdf2swf/Makefile if test "x${DISABLEJPEG2SWF}" = "xtrue"; then echo "Disabling jpeg2swf tool..." - fi + export JPEG2SWF= + fi echo "***************************************************" FILES="./release Makefile lib/Makefile src/Makefile" else FILES="./release Makefile lib/Makefile src/Makefile pdf2swf/Makefile pdf2swf/xpdf/Makefile pdf2swf/fonts/Makefile" fi + trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure @@ -2956,6 +2960,7 @@ s%@PACKAGE@%$PACKAGE%g s%@VERSION@%$VERSION%g s%@HAVE_UNISTD_H@%$HAVE_UNISTD_H%g s%@LIBOBJS@%$LIBOBJS%g +s%@JPEG2SWF@%$JPEG2SWF%g CEOF EOF -- 1.7.10.4