X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=configure.in;h=fd70293b28a3b743deafc366604f5e934204c54b;hb=25383c0c1eaef546f83e65dc2514f493a0de19c6;hp=1a5efbe92f0b2f6a7fef91cb6bfcee906805990f;hpb=5efcb6288e64cdc160c5456c4cb6ddd0a0bb16cc;p=swftools.git

diff --git a/configure.in b/configure.in
index 1a5efbe..fd70293 100644
--- a/configure.in
+++ b/configure.in
@@ -14,6 +14,7 @@ CHECKMEM=
 PROFILING=
 ENABLE_WARNINGS=
 OPTIMIZE=
+USE_POPPLER=
 DISABLE_LAME=
 
 AC_ARG_ENABLE(checkmem,
@@ -26,15 +27,17 @@ AC_ARG_ENABLE(warnings,
 [  --enable-warnings	   turn on compiler warnings], ENABLE_WARNINGS=true)
 AC_ARG_ENABLE(optimizations,
 [  --enable-optimizations  turn on compiler optimizations (recommended for avi2swf)], OPTIMIZE=true)
+AC_ARG_ENABLE(poppler,
+[  --enable-poppler       link againist libpoppler], USE_POPPLER=true)
 AC_ARG_ENABLE(lame,
-[  --disable-lame          don't compile any L.A.M.E. mp3 encoding code in],
+[  --disable-lame          "don't compile any L.A.M.E. mp3 encoding code in"],
 
 if test "x$enable_lame" = "xno";then
     DISABLE_LAME=yes
 fi,DISABLE_LAME=)
 
 PACKAGE=swftools
-VERSION=2010-02-06-1900
+VERSION=0.9.1
 
 # ------------------------------------------------------------------
 
@@ -272,7 +275,7 @@ 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 mmap lrand48 rand srand48 srand bcopy bzero time getrusage mallinfo open64)
+ AC_CHECK_FUNCS(popen wcschr wcsdup mkstemp stat mmap lrand48 rand srand48 srand bcopy bzero time getrusage mallinfo open64 calloc)
 
 AC_CHECK_SIZEOF([signed char])
 AC_CHECK_SIZEOF([signed short])
@@ -322,29 +325,33 @@ else
 fi
 AC_SUBST(lame_in_source)
 
-splash_in_source='$(splash_objects)'
-xpdf_in_source='$(xpdf_objects)'
-
-dnl if test "x$USE_POPPLER" = "xtrue"; then
-dnl     xpdf_in_source=
-dnl     splash_in_source=
-dnl     AC_DEFINE([HAVE_POPPLER],[1],[use poppler])
-dnl     PKG_CHECK_MODULES([POPPLER],[poppler poppler-splash],,[poppler_pkgconfig=no])
-dnl     if test "x$poppler_pkgconfig" = "xno"; then
-dnl         AC_LANG_PUSH([C++])
-dnl         AC_CHECK_HEADERS([OutputDev.h],[
-dnl            AC_CHECK_LIB([poppler],[main],,[])
-dnl         ],[AC_MSG_ERROR([No poppler library found. This library is required.])])
-dnl         AC_LANG_POP
-dnl     else
-dnl 	CPPFLAGS="$CPPFLAGS $POPPLER_CFLAGS"
-dnl         AC_DEFINE([HAVE_POPPLER], [1])
-dnl         LIBS="$LIBS $POPPLER_LIBS"
-dnl     fi
-dnl fi
+xpdf_in_source=
+splash_in_source=
+xpdf_include=
+
+if test "x$USE_POPPLER" = "xtrue"; then
+    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"
+        LIBS="$LIBS $POPPLER_LIBS"
+        AC_DEFINE([HAVE_POPPLER], [1])
+    fi
+else
+    splash_in_source='$(splash_objects)'
+    xpdf_in_source='$(xpdf_objects)'
+    xpdf_include=' -I xpdf '
+fi
 
 AC_SUBST([xpdf_in_source])
 AC_SUBST([splash_in_source])
+AC_SUBST([xpdf_include])
 
 # ------------------------------------------------------------------
 
@@ -391,11 +398,15 @@ fi
 RFX_CHECK_RUBY
 
 if test "x$RUBY_OK" '!=' "xyes";then
-    echo all install uninstall clean: > lib/ruby/Makefile
+    if test -d "lib/ruby/";then
+	echo all install uninstall clean: > lib/ruby/Makefile
+    fi
     # fail silently- the most users won't have any need for the
     # ruby interface anyway
 else
-    rubygfx="lib/ruby/Makefile"
+    if test -f "lib/ruby/Makefile.in";then
+	rubygfx="lib/ruby/Makefile"
+    fi
 fi
 
 # ------------------------------------------------------------------
@@ -570,6 +581,7 @@ AH_BOTTOM([
 #ifdef HAVE_POPPLER
 #define GString GooString
 #define GHash GooHash
+#define GHashIter GooHashIter
 #endif
 
 #ifdef HAVE_ZZIP_LIB_H
@@ -578,6 +590,10 @@ AH_BOTTOM([
 #endif
 #endif
 
+// supply a substitute calloc function if necessary
+#ifndef HAVE_CALLOC
+#define calloc rfx_calloc_replacement
+#endif
 
 #endif // __config_h__
 ])