X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=configure;h=ea50ce7b6720c9c633e8364aa1f4331ba6a2d241;hb=335b6b2b798d308f333c371caae0bfc7628506db;hp=778079c9b1a76641f26369864b3f3d77fd5f3b6b;hpb=c2911e50c1e98ccf8ea6224fd9466dce13ca6d8e;p=swftools.git

diff --git a/configure b/configure
index 778079c..ea50ce7 100755
--- a/configure
+++ b/configure
@@ -10103,7 +10103,7 @@ done
 
 OLDCPPFLAGS="${CPPFLAGS}"
 OLDLIBS="${LIBS}"
-if test "x${FREETYPE_CONFIG}" != "x"; then
+if test "x${FREETYPE_CONFIG}" '!=' "x"; then
     CPPFLAGS="$CPPFLAGS "`freetype-config --cflags`
 else if test -d /usr/include/freetype2; then
     CPPFLAGS="$CPPFLAGS -I/usr/include/freetype2"
@@ -10482,14 +10482,17 @@ fi
 done
 
 
-if test "x${HAVE_LIB_FREETYPE}" != "x";then
-if test "x${HAVE_FREETYPE_FREETYPE_H}" != "x";then
-    HAVE_FREETYPE=1
-fi
+if test "x${HAVE_LIB_FREETYPE}" '!=' "x";then
+    if test "x${HAVE_FREETYPE_FREETYPE_H}" '!=' "x";then
+	HAVE_FREETYPE=1
+    fi
+    if test "x${HAVE_FT2BUILD_H}" '!=' "x";then
+	HAVE_FREETYPE=1
+    fi
 fi
 
 if test "x${HAVE_FREETYPE}" = "x1"; then
-    if test "x{$FREETYPE_CONFIG}" != "x"; then
+    if test "x{$FREETYPE_CONFIG}" '!=' "x"; then
 	LIBS="$LIBS "`freetype-config --libs`
     else
 	LIBS="$LIBS -lfreetype"
@@ -10581,7 +10584,7 @@ echo "${ECHO_T}no" >&6
 fi
 
 # if the above didn't work out, reset all changes to the compiler variables.
-if test "x${HAVE_FREETYPE}" "!=" "x1"; then
+if test "x${HAVE_FREETYPE}" '!=' "x1"; then
     CPPFLAGS=$OLDCPPFLAGS
     LIBS=$OLDLIBS
 fi
@@ -10825,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>
 
@@ -11621,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}"