X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=configure.in;h=ffa2b3b11188a85bc3188bbe1fcad8aaf8246c65;hb=dd3862f94e010c7b8ae372aa48404d7b24e0d62d;hp=ecd33a311a269fd455a758464583fdfbac4a26d5;hpb=1d5bfc54842481ae55acf0ed28feb636d549975a;p=swftools.git

diff --git a/configure.in b/configure.in
index ecd33a3..ffa2b3b 100644
--- a/configure.in
+++ b/configure.in
@@ -7,7 +7,7 @@ AC_ARG_ENABLE(debug,
 [  --enable-debug          turn on debugging], DEBUG=true)
 
 PACKAGE=swftools
-VERSION=0.4.4-pre6
+VERSION=0.5.0-pre8
 # -Winline?
 
 if test "x$CHECKMEM" '!=' "x";then
@@ -16,6 +16,9 @@ fi
 if test "x$DEBUG" '!=' "x";then
     CFLAGS="-Wparentheses -Wimplicit -Wreturn-type -g $CFLAGS"
     CXXFLAGS="-Wparentheses -Wimplicit -Wreturn-type -g $CXXFLAGS"
+    STRIP="@echo debug enabled, not stripping "
+    export STRIP
+    AC_SUBST(STRIP)
 else
     CFLAGS="-Wparentheses -Wimplicit -Wreturn-type -O -fomit-frame-pointer $CFLAGS"
     CXXFLAGS="-Wparentheses -Wimplicit -Wreturn-type -O -fomit-frame-pointer $CXXFLAGS"
@@ -54,12 +57,20 @@ fi
  AC_PROG_LN_S
  AC_PROG_LIBTOOL
  AC_CHECK_PROGS(UNCOMPRESS, gzip uncompress compress, )
+ AC_CHECK_PROGS(FREETYPE_CONFIG, freetype-config, )
+
+if test "x$FREETYPE_CONFIG" != "x";then
+    USE_FREETYPE=yes
+fi
 
 dnl Checks for system services
  AC_EXEEXT
 
 RFX_CHECK_MING
 
+if test "x${MINGW}" != "xyes"; then
+    AC_DEFINE_UNQUOTED(O_BINARY, 0)
+fi
 # The following tries to make use of includes and libraries in
 # /usr/local, too. Notice: A -I/usr/local/include might break
 # things (MingW, cross-compiling etc.) in the same way as -I/usr/include, 
@@ -73,6 +84,14 @@ if test -d /usr/local/include; then
 #   CPPFLAGS="$CPPFLAGS -I/usr/local/include"
     echo > /dev/null
 fi
+if test "$prefix" != "NONE" -a "$prefix" != "/usr/local" -a "$prefix" != "/usr/local/"; then
+    # if the user has a special prefix (like /opt), there might also be $prefix/lib
+    # and $prefix/include, which should be included in our search paths for libraries
+    # and includes.
+    LDFLAGS="$LDFLAGS -L${libdir}"
+    CPPFLAGS="$CPPFLAGS -I${includedir}"
+    # TODO- test whether gcc still works after this
+fi
 
 dnl Checks for libraries.
  AC_CHECK_LIB(m, sin,, 
@@ -93,6 +112,9 @@ dnl Checks for libraries.
  DISABLEPDF2SWF=true;
  MISSINGLIBS="${MISSINGLIBS} t1lib"
  )
+ AC_CHECK_LIB(freetype, FT_Init_FreeType,
+ USE_FREETYPE=true,
+ )
 
 RFX_CHECK_BYTEORDER
 AC_SUBST(WORDS_BIGENDIAN)
@@ -105,7 +127,7 @@ dnl Checks for header files.
  AC_CONFIG_HEADER(config.h)
  AC_HEADER_DIRENT
  AC_HEADER_STDC
- AC_CHECK_HEADERS(zlib.h jpeglib.h t1lib.h sys/stat.h sys/types.h dirent.h sys/bsdtypes.h sys/ndir.h sys/dir.h ndir.h)
+ AC_CHECK_HEADERS(zlib.h jpeglib.h t1lib.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)
 
 if test "x${ac_cv_header_jpeglib_h}" != "xyes"; then
  DISABLEPDF2SWF=true;
@@ -122,6 +144,7 @@ if test "x${ac_cv_header_zlib_h}" != "xyes"; then
  ZLIBMISSING=true;
 fi
 
+AC_DEFINE_UNQUOTED(USE_FREETYPE, "$USE_FREETYPE")
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
 AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
 AC_SUBST(PACKAGE)
@@ -156,6 +179,26 @@ if test "x${AVIFILE}" != "xtrue"; then
  avi2swf=
 fi
 
+if test "x${USE_FREETYPE}" == "xtrue"; then
+    if test "x{$FREETYPE_CONFIG}" != "x"; then
+	ftinclude=`freetype-config --cflags`
+	ftlibs=`freetype-config --libs`
+	CXXFLAGS="$CXXFLAGS $ftinclude"
+	CFLAGS="$CFLAGS $ftinclude"
+	LIBS="$LIBS $ftlibs"
+    else if test -d /usr/include/freetype2; then
+	CXXFLAGS="$CXXFLAGS -I/usr/include/freetype2"
+	CFLAGS="$CFLAGS -I/usr/include/freetype2"
+	LIBS="$LIBS -lfreetype"
+    else if test -d /usr/local/include/freetype2; then
+	CXXFLAGS="$CXXFLAGS -I/usr/local/include/freetype2"
+	CFLAGS="$CFLAGS -I/usr/local/include/freetype2"
+	LIBS="$LIBS -L /usr/local/lib -lfreetype"
+    fi
+    fi
+    fi
+fi 
+
 if test "x${UNCOMPRESS}" = "xgzip"; then
     AC_DEFINE_UNQUOTED(USE_GZIP, 1)
 fi