X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=configure.in;h=010aaa08c3704e3d324e5132225bf11c7a4d4d3c;hb=6a913f2a58d4eb0aa6b05dbd3f662474b942a5ff;hp=e39a0d7ea47066f38688c2fc45cb549961f67322;hpb=d88738c6577aa4953a61153d7551bae676ca7da3;p=swftools.git

diff --git a/configure.in b/configure.in
index e39a0d7..010aaa0 100644
--- a/configure.in
+++ b/configure.in
@@ -20,10 +20,12 @@ AC_ARG_ENABLE(optimizations,
 AC_ARG_ENABLE(lame,
 [  --disable-lame          don't compile any L.A.M.E. mp3 encoding code in], DISABLE_LAME=true)
 AC_ARG_WITH([external-libart],
-[  --with-external-libart  use external libart library (at your own risk)], [EXTERNAL_LIBART=true])
+[  --with-external-libart  use external libart library (currently broken)], [EXTERNAL_LIBART=true])
+AC_ARG_WITH([poppler],
+[  --with-poppler          use poppler instead of internal xpdf (currently broken)], [USE_POPPLER=true])
 
 PACKAGE=swftools
-VERSION=2008-06-23-2005
+VERSION=2008-09-22-1956
 
 
 # ------------------------------------------------------------------
@@ -135,6 +137,8 @@ fi
  AC_PROG_LN_S
  AC_CHECK_PROGS(UNCOMPRESS, gzip uncompress compress, )
 
+PKG_PROG_PKG_CONFIG
+
 dnl Checks for system services
 OBJEXT="o"
 AREXT=".a"
@@ -232,7 +236,7 @@ dnl Checks for header files.
  AC_HEADER_DIRENT
  AC_HEADER_STDC
 
- AC_CHECK_HEADERS(zlib.h gif_lib.h io.h wchar.h jpeglib.h assert.h signal.h pthread.h sys/stat.h sys/types.h dirent.h sys/bsdtypes.h sys/ndir.h sys/dir.h ndir.h time.h sys/time.h sys/resource.h)
+ AC_CHECK_HEADERS(zlib.h gif_lib.h io.h wchar.h jpeglib.h assert.h signal.h pthread.h sys/stat.h sys/mman.h sys/types.h dirent.h sys/bsdtypes.h sys/ndir.h sys/dir.h ndir.h time.h sys/time.h sys/resource.h)
 
 AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
 AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])
@@ -249,14 +253,13 @@ dnl Checks for typedefs, structures, and compiler characteristics.
  AC_TYPE_SIZE_T
  AC_STRUCT_TM
  AC_CHECK_TYPE(boolean,int) #needed for jpeglib
- AC_CHECK_FUNCS(popen wcschr wcsdup mkstemp stat lrand48 rand srand48 srand bcopy bzero time getrusage mallinfo)
+ AC_CHECK_FUNCS(popen wcschr wcsdup mkstemp stat mmap lrand48 rand srand48 srand bcopy bzero time getrusage mallinfo)
 
+AC_CHECK_SIZEOF([signed char])
+AC_CHECK_SIZEOF([signed short])
 AC_CHECK_SIZEOF([signed])
-AC_CHECK_SIZEOF([unsigned])
-AC_CHECK_SIZEOF([signed long])
-AC_CHECK_SIZEOF([unsigned long])
 AC_CHECK_SIZEOF([signed long long])
-AC_CHECK_SIZEOF([unsigned long long])
+AC_CHECK_SIZEOF([void*])
 
 RFX_CHECK_FREETYPE
 
@@ -277,7 +280,7 @@ else
     if test -f lib/lame/Makefile.in; then
 	lame_in_source='$(lame_objects)'
 	lame_makefile="lib/lame/Makefile"
-	CPPFLAGS="$CPPFLAGS -Ilame"
+	CPPFLAGS="$CPPFLAGS -Ilame -Ilib/lame"
 	AC_DEFINE([HAVE_LAME], [1], [have/use internal l.a.m.e. mp3 library])
     else
 	if test -d /usr/include/lame; then
@@ -314,6 +317,29 @@ if test "x$EXTERNAL_LIBART" = "xtrue"; then
 fi
 AC_SUBST([art_in_source])
 
+xpdf_in_source='$(xpdf_objects)'
+splash_in_source='$(splash_objects)'
+
+if test "x$USE_POPPLER" = "xtrue"; then
+    xpdf_in_source=
+    splash_in_source=
+    AC_DEFINE([HAVE_POPPLER],[1],[use poppler])
+    PKG_CHECK_MODULES([POPPLER],[poppler poppler-splash],,[poppler_pkgconfig=no])
+    if test "x$poppler_pkgconfig" = "xno"; then
+        AC_LANG_PUSH([C++])
+        AC_CHECK_HEADERS([OutputDev.h],[
+           AC_CHECK_LIB([poppler],[main],,[])
+        ],[AC_MSG_ERROR([No poppler library found. This library is required.])])
+        AC_LANG_POP
+    else
+	CPPFLAGS="$CPPFLAGS $POPPLER_CFLAGS"
+        AC_DEFINE([HAVE_POPPLER], [1])
+        LIBS="$LIBS $POPPLER_LIBS"
+    fi
+fi
+AC_SUBST([xpdf_in_source])
+AC_SUBST([splash_in_source])
+
 # ------------------------------------------------------------------
  
 RFX_CHECK_AVI2SWF
@@ -429,7 +455,7 @@ LIBPDF='libpdf$(A)'
 if test "x${DISABLEPDF2SWF}" = "xtrue"; then
   echo "* Disabling pdf2swf tool..."
   rm -f lib/pdf/Makefile
-  echo all install uninstall clean: > lib/pdf/Makefile
+  echo all install uninstall clean libpdf: > lib/pdf/Makefile
   pdf2swf_makefile=""
   PDF2SWF=
   LIBPDF=
@@ -506,13 +532,17 @@ AH_BOTTOM([
 #endif
 #endif
 
+#ifdef HAVE_POPPLER
+#define GString GooString
+#define GHash GooHash
+#endif
+
 #endif // __config_h__
 ])
 
-
-
 if test -f "release.in"; then release_in="./release"; fi
-FILES="$release_in Makefile.common ${avi2swf} Makefile lib/Makefile lib/action/Makefile src/Makefile ${pdf2swf_makefile} swfs/Makefile pdf2swf/fonts/Makefile ${pythonrfxswf} ${lame_makefile} lib/art/Makefile lib/readers/Makefile"
+if test -f "Makefile.new.in"; then mk_in="./Makefile.new"; fi
+FILES="$release_in $mk_in Makefile.common ${avi2swf} Makefile lib/Makefile lib/action/Makefile src/Makefile ${pdf2swf_makefile} swfs/Makefile ${pythonrfxswf} ${lame_makefile} lib/art/Makefile lib/readers/Makefile"
 AC_OUTPUT(${FILES})
 
 dnl new autoconf