[Nautilus-list] Problem with Freetype2 detection in aclocal macro


I found a problem with the aclocal macro used to detect Freetype2. When Freetype is not installed in a standard location, the ft2build.h file is not found and the other freetype headers are not correctly pre-processed (they need some of the definitions from ft2build.h).
In order to fix this, I add the <prefi>/include path in FREETYPE2_CFLAGS variable.

Here is the patch.

 		   Remi Cohen-Scali
<Remi Cohen-Scali com> 		<rcoscali rcsnet net>
Index: ChangeLog
RCS file: /cvs/gnome/nautilus/ChangeLog,v
retrieving revision 1.4715
diff -u -r1.4715 ChangeLog
--- ChangeLog	2001/08/03 07:48:25	1.4715
+++ ChangeLog	2001/08/05 02:07:08
@@ -1,3 +1,10 @@
+2001-08-05  Remi Cohen-Scali  <remi cohen-scali com>
+	* hack-macros/nautilus-macros.m4 (dnl): Fixed a problem with freetype2
+	detection. When freetype is not installed in a standard location, the
+	freetype headers are not correctly preprocessed because they need a file
+	-- ft2build.h -- that is not found.
 2001-08-02  Maciej Stachowiak  <mjs noisehavoc org>
 	* libnautilus/nautilus-view-standard-main.c:
Index: hack-macros/nautilus-macros.m4
RCS file: /cvs/gnome/gnome-common/hack-macros/nautilus-macros.m4,v
retrieving revision 1.3
diff -u -r1.3 nautilus-macros.m4
--- hack-macros/nautilus-macros.m4	2001/05/07 18:40:30	1.3
+++ hack-macros/nautilus-macros.m4	2001/08/05 02:07:08
@@ -93,7 +93,7 @@
   if test "$FREETYPE2_CONFIG" = "no" ; then
-    FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG $freetype2conf_args --cflags`
+    FREETYPE2_CFLAGS="-I$freetype2_prefix/include `$FREETYPE2_CONFIG $freetype2conf_args --cflags`"
     FREETYPE2_LIBS=`$FREETYPE2_CONFIG $freetype2conf_args --libs`
     freetype2_major_version=`$FREETYPE2_CONFIG $freetype2_args --version | \

[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]