[Wesnoth-cvs-commits] wesnoth configure.ac

[ott]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     ott <address@hidden>    05/05/21 12:29:03

Modified files:
        .              : configure.ac 

Log message:
        fix freetype -I flags to use CPPFLAGS: CFLAGS is useless using a C++ 
compiler!

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/configure.ac.diff?tr1=1.145&tr2=1.146&r1=text&r2=text

Patches:
Index: wesnoth/configure.ac
diff -u wesnoth/configure.ac:1.145 wesnoth/configure.ac:1.146
--- wesnoth/configure.ac:1.145  Mon Apr 25 22:57:50 2005
+++ wesnoth/configure.ac        Sat May 21 12:29:03 2005
@@ -37,7 +37,7 @@
 EOF
 ])
 
-AC_REVISION([$Revision: 1.145 $])
+AC_REVISION([$Revision: 1.146 $])
 
 AC_CONFIG_AUX_DIR([config])
 AC_CONFIG_SRCDIR([src/actions.cpp])
@@ -521,13 +521,10 @@
 AC_SUBST([SDL_NET_LIBS])
 #AC_SUBST([SDL_TTF_LIBS])
 
-# Cheching for the freetype library. This was directly copied from the config 
script
-# of SDL_ttf, and I do not really understand how this works.
+# Checking for the freetype library. This was copied from the
+# config script of SDL_ttf, modified for CPPFLAGS
 
-dnl Check for the FreeType 2 library
-dnl
 dnl Get the cflags and libraries from the freetype-config script
-dnl
 
 AC_ARG_WITH([freetype-prefix],
             AS_HELP_STRING([--with-freetype-prefix=PFX], [Prefix where 
FREETYPE is installed (optional)]),
@@ -558,7 +555,7 @@
 *** Unable to find FreeType2 library (http://www.freetype.org/)
 ])
 else
-    CFLAGS="$CFLAGS `$FREETYPE_CONFIG $freetypeconf_args --cflags`"
+    CPPFLAGS="$CPPFLAGS `$FREETYPE_CONFIG $freetypeconf_args --cflags`"
     FREETYPE_LIBS=`$FREETYPE_CONFIG $freetypeconf_args --libs`
 fi