X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=configure;h=ea50ce7b6720c9c633e8364aa1f4331ba6a2d241;hb=335b6b2b798d308f333c371caae0bfc7628506db;hp=68d36b8d7232d053831b08744d0dc2ae5e5fbe26;hpb=2aa16354be81743de06885ce8fbf6f80f24dfef2;p=swftools.git

diff --git a/configure b/configure
index 68d36b8..ea50ce7 100755
--- a/configure
+++ b/configure
@@ -10828,6 +10828,12 @@ if test "x${HAVE_FONTCONFIG}" = "x1"; then
 echo "$as_me:$LINENO: checking whether we can compile the fontconfig test program" >&5
 echo $ECHO_N "checking whether we can compile the fontconfig test program... $ECHO_C" >&6
 
+if (echo $LIBS | grep lfreetype >/dev/null 2>&1); then
+    #move freetype library to the end of libraries, otherwise fontconfig
+    #won't compile.
+    LIBS=`echo $LIBS | sed -e 's/-lfreetype//g' -e 's/$/ -lfreetype/'`
+fi
+
 cat > conftest.c << EOF
 #include <fontconfig.h>
 
@@ -11624,7 +11630,8 @@ fi
 
 # ------------------------------------------------------------------
 
-FILES="./release Makefile.common ${avi2swf} Makefile lib/Makefile lib/action/Makefile src/Makefile ${pdf2swf_makefile} swfs/Makefile ${pythonrfxswf} ${lame_makefile}"
+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 ${pythonrfxswf} ${lame_makefile}"
 
           ac_config_files="$ac_config_files ${FILES}"