mail[Wesnoth-commits] r25207 - in /trunk: configure.ac src/Makefile.am


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by esr on March 27, 2008 - 21:59:
Author: esr
Date: Thu Mar 27 21:59:02 2008
New Revision: 25207

URL: http://svn.gna.org/viewcvs/wesnoth?rev=25207&view=rev
Log:
Remove freetype configuration stuff, as we no longer build our own ttf 
library.

Modified:
    trunk/configure.ac
    trunk/src/Makefile.am

Modified: trunk/configure.ac
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/configure.ac?rev=25207&r1=25206&r2=25207&view=diff
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Thu Mar 27 21:59:02 2008
@@ -733,46 +733,6 @@
 AC_SUBST([SDL_NET_LIBS])
 AC_SUBST([SDL_TTF_LIBS])
 
-# Checking for the freetype library. This was copied from the
-# config script of SDL_ttf, modified for CPPFLAGS
-
-dnl Get the cflags and libraries from the freetype-config script
-
-AC_ARG_WITH([freetype-prefix],
-            AS_HELP_STRING([--with-freetype-prefix=PFX], [Prefix where 
FREETYPE is installed (optional)]),
-            [freetype_prefix="$withval"],
-            [freetype_prefix=""])
-
-AC_ARG_WITH([freetype-exec-prefix],
-            AS_HELP_STRING([--with-freetype-exec-prefix=PFX], [Exec prefix 
where FREETYPE is installed (optional)]),
-            [freetype_exec_prefix="$withval"],
-            [freetype_exec_prefix=""])
-
-if test x$freetype_exec_prefix != x ; then
-     freetype_args="$freetype_args --exec-prefix=$freetype_exec_prefix"
-     if test x${FREETYPE_CONFIG+set} != xset ; then
-        FREETYPE_CONFIG=$freetype_exec_prefix/bin/freetype-config
-     fi
-fi
-if test x$freetype_prefix != x ; then
-     freetype_args="$freetype_args --prefix=$freetype_prefix"
-     if test x${FREETYPE_CONFIG+set} != xset ; then
-        FREETYPE_CONFIG=$freetype_prefix/bin/freetype-config
-     fi
-fi
-AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)
-no_freetype=""
-if test "$FREETYPE_CONFIG" = "no" ; then
-    AC_MSG_ERROR([
-*** Unable to find FreeType2 library (http://www.freetype.org/)
-])
-else
-    CPPFLAGS="$CPPFLAGS `$FREETYPE_CONFIG $freetypeconf_args --cflags`"
-    FREETYPE_LIBS=`$FREETYPE_CONFIG $freetypeconf_args --libs`
-fi
-
-AC_SUBST([FREETYPE_LIBS])
-
 #######################################################################
 # Checks for header files.                                            #
 #######################################################################

Modified: trunk/src/Makefile.am
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/Makefile.am?rev=25207&r1=25206&r2=25207&view=diff
==============================================================================
--- trunk/src/Makefile.am (original)
+++ trunk/src/Makefile.am Thu Mar 27 21:59:02 2008
@@ -36,7 +36,7 @@
 pkgdatadir=$(datadir)/@DATADIR@
 
 THELIBS = -L. -lwesnoth-core $(SDL_IMAGE_LIBS) $(SDL_MIXER_LIBS) 
$(SDL_NET_LIBS) \
-       $(SDL_TTF_LIBS) $(SDL_LIBS) $(PYTHON_LIBS) $(FREETYPE_LIBS) 
$(LIBINTL) \
+       $(SDL_TTF_LIBS) $(SDL_LIBS) $(PYTHON_LIBS) $(LIBINTL) \
        $(BOOST_IOSTREAMS_LIBS) $(BOOST_REGEX_LIBS)
 
 wesnoth_source = \




Related Messages


Powered by MHonArc, Updated Thu Mar 27 22:02:04 2008