configure and package description update:

- SDL_TTF replaced by freetype
- swscale added to debian control file

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1475 b956fd51-792f-4845-bead-9b4dfca2ff2c

2 files changed, 77 insertions, 0 deletions

diff --git a/configure b/configure
index aa40f065..385a5eb1 100755
--- a/configure
+++ b/configure
@@ -4696,6 +4696,80 @@ See the pkg-config man page for more details.
     fi
 
 
+# find freetype
+
+    have_lib="no"
+    { $as_echo "$as_me:$LINENO: checking for freetype2" >&5
+$as_echo_n "checking for freetype2... " >&6; }
+    if test x"$with_freetype" = xnocheck; then
+        # do not call pkg-config, use user settings
+        have_lib="yes"
+    elif test x"$with_freetype" != xno; then
+        # check if package exists
+	if test -n "$PKG_CONFIG" && \
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"freetype2\"") >&5
+  ($PKG_CONFIG --exists --print-errors "freetype2") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+
+            have_lib="yes"
+            freetype_LIBS=`$PKG_CONFIG --libs --silence-errors "freetype2"`
+            freetype_LIBDIRS=`$PKG_CONFIG --libs-only-L --silence-errors "freetype2"`
+            freetype_LIBDIRS=`
+    echo "$freetype_LIBDIRS" | $SED 's/^[ \t]*//' | $SED 's/[ \t]*$//'
+`
+            # add library directories to LIBS (ignore *_LIBS for now)
+	    if test -n "$freetype_LIBDIRS"; then
+                LIBS="$LIBS $freetype_LIBDIRS"
+            fi
+
+fi
+    fi
+    if test x$have_lib = xyes; then
+        freetype_HAVE="yes"
+        if test -n "$freetype_LIBDIRS"; then
+            # show additional lib-dirs
+            { $as_echo "$as_me:$LINENO: result: yes ($freetype_LIBDIRS)" >&5
+$as_echo "yes ($freetype_LIBDIRS)" >&6; }
+        else
+            { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+        fi
+    else
+        freetype_HAVE="no"
+        { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+
+        # check if package is required
+        if test xyes = xyes -o x"$with_freetype" = xyes ; then
+            # print error message and quit
+            err_msg=`$PKG_CONFIG --errors-to-stdout --print-errors "freetype2"`
+            { { $as_echo "$as_me:$LINENO: error:
+
+$err_msg
+
+Alternatively, you may set --with-freetype=nocheck and the environment
+variables freetype_[...] (see configure --help)
+to appropriate values to avoid the need to call pkg-config.
+
+See the pkg-config man page for more details.
+" >&5
+$as_echo "$as_me: error:
+
+$err_msg
+
+Alternatively, you may set --with-freetype=nocheck and the environment
+variables freetype_[...] (see configure --help)
+to appropriate values to avoid the need to call pkg-config.
+
+See the pkg-config man page for more details.
+" >&2;}
+   { (exit 1); exit 1; }; }
+        fi
+    fi
+
+
 # find sqlite3
 
     have_lib="no"
diff --git a/configure.ac b/configure.ac
index 8229210c..84f06d58 100644
--- a/configure.ac
+++ b/configure.ac
@@ -160,6 +160,9 @@ PKG_HAVE([libpng], [libpng12], yes)
 # find sdl
 PKG_HAVE([sdl], [sdl], yes)
 
+# find freetype
+PKG_HAVE([freetype], [freetype2], yes)
+
 # find sqlite3
 PKG_HAVE([sqlite3], [sqlite3], yes)