* implemented disabling of jpeg2swf if jpeglib isn't found

* put an install: target in the (disabled) pdf2swf Makefile

diff --git a/configure.in b/configure.in
index 85ad02f..d9da65b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -32,7 +32,7 @@ dnl Checks for libraries.
  MISSINGLIBS="${MISSINGLIBS} zlib"
  exit;
  )
- AC_CHECK_LIB(jpeg, jpeg_write_raw_data,, 
+ AC_CHECK_LIB(xjpeg, jpeg_write_raw_data,, 
  DISABLEPDF2SWF=true;
  DISABLEJPEG2SWF=true;
  MISSINGLIBS="${MISSINGLIBS} jpeglib"
@@ -90,20 +90,23 @@ dnl Checks for library functions.
  AC_FUNC_VPRINTF
  AC_CHECK_FUNCS(getcwd putenv socket strcspn strdup strerror strstr)
 
+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..."
-    dnl FIXME: Do something here
+    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
+AC_SUBST(JPEG2SWF)
 
 AC_OUTPUT(${FILES})