[Gnash-commit] gnash ChangeLog macros/freetype.m4

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/09/14 06:46:27

Modified files:
        .              : ChangeLog 
        macros         : freetype.m4 

Log message:
                * macros/freetype.m4: don't miss to add a -I to cflags; add a 
note
                  about the non-sense of the way we check for /usr/include.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4315&r2=1.4316
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/freetype.m4?cvsroot=gnash&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4315
retrieving revision 1.4316
diff -u -b -r1.4315 -r1.4316
--- ChangeLog   14 Sep 2007 03:24:15 -0000      1.4315
+++ ChangeLog   14 Sep 2007 06:46:27 -0000      1.4316
@@ -1,3 +1,8 @@
+2007-09-14 Sandro Santilli <address@hidden>
+
+       * macros/freetype.m4: don't miss to add a -I to cflags; add a note
+         about the non-sense of the way we check for /usr/include.
+
 2007-09-14 Markus Gothe <address@hidden>
 
        * server/asobj/BevelFilter_as.cpp, server/asobj/BitMapFilter_as.cpp,

Index: macros/freetype.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/freetype.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- macros/freetype.m4  13 Sep 2007 22:50:51 -0000      1.1
+++ macros/freetype.m4  14 Sep 2007 06:46:27 -0000      1.2
@@ -21,7 +21,7 @@
     AC_CACHE_VAL(ac_cv_path_freetype_incl,[
     if test x"${with_freetype_incl}" != x ; then
       if test -f ${with_freetype_incl}/freetype/freetype.h ; then
-             ac_cv_path_freetype_incl=`(cd ${with_freetype_incl}; pwd)`
+             ac_cv_path_freetype_incl=-I`(cd ${with_freetype_incl}; pwd)`
       else
              AC_MSG_ERROR([${with_freetype_incl} directory doesn't contain 
freetype/freetype.h])
       fi
@@ -56,6 +56,8 @@
   fi
 
 
+  dnl This check is bogus, ac_cv_path_freetype_incl will have -I too, and 
possibly multiple things too
+  dnl so at most we can try to *strip* any -I/usr/include
   if test x"${ac_cv_path_freetype_incl}" != x"/usr/include"; then
     ac_cv_path_freetype_incl="${ac_cv_path_freetype_incl}"
   else