X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=configure;h=94db70cb66265a065c6b6ce6d5dbc6c0b1454ba2;hb=ab0db45e689d1992b62773a094111ea19115f77c;hp=b1959024611a39380d85b5e602799c141cb2231b;hpb=584677547f7957ef1193194c16f19ad945ffe705;p=swftools.git

diff --git a/configure b/configure
index b195902..94db70c 100755
--- a/configure
+++ b/configure
@@ -1940,8 +1940,8 @@ if test "x$PROFILING" '!=' "x";then
 fi
 if test "x$DEBUG" '!=' "x";then
     if test "x$PROFILING" = "x";then
-        CFLAGS="$WARNINGS -g $CFLAGS"
-        CXXFLAGS="$WARNINGS -g $CXXFLAGS"
+        CFLAGS="$WARNINGS -O2 -g $CFLAGS"
+        CXXFLAGS="$WARNINGS -O2 -g $CXXFLAGS"
         LDFLAGS="-g $LIBS"
     else
         CFLAGS="$WARNINGS -O2 -g -pg $CFLAGS"
@@ -10002,6 +10002,7 @@ fi
 done
 
     else
+        USES_EXTERNAL_LIBART=1
 	CPPFLAGS="$CPPFLAGS $LIBART_CFLAGS"
         cat >>confdefs.h <<\_ACEOF
 #define INTERNAL_LIBART 0
@@ -10555,6 +10556,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
     else
+        USES_EXTERNAL_POPPLER=1
 	CPPFLAGS="$CPPFLAGS $POPPLER_CFLAGS"
         cat >>confdefs.h <<\_ACEOF
 #define HAVE_POPPLER 1
@@ -10927,8 +10929,8 @@ else
     if test "x$PYTHON_LIB" '!=' "x" -o "x$PYTHON_INCLUDES" '!=' "x";then
         echo "Set both PYTHON_LIB and PYTHON_INCLUDES, or none at all"
     fi
-    # iterate through version 2.2 to 2.5
-    for v in 2 3 4 5; do
+    # iterate through version 2.2 to 2.6
+    for v in 2 3 4 5 6; do
         # Linux
         if test -f "/usr/include/python2.$v/Python.h";then
             PY_VERSION=2.$v
@@ -11189,10 +11191,24 @@ fi
 
 
 
+if test "$USES_EXTERNAL_POPPLER";then
+    echo "*"
+    echo "*"
+    echo "* uses external poppler library"
+    echo "*"
+    echo "*"
+fi
+if test "$USES_EXTERNAL_LIBART";then
+    echo "*"
+    echo "*"
+    echo "* uses external libart library"
+    echo "*"
+    echo "*"
+fi
 
 if test -f "release.in"; then release_in="./release"; fi
 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 pdf2swf/fonts/Makefile ${pythonrfxswf} ${lame_makefile} lib/art/Makefile lib/readers/Makefile"
+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_config_files="$ac_config_files ${FILES}"
 
 cat >confcache <<\_ACEOF