summaryrefslogtreecommitdiff
path: root/configure.in
diff options
context:
space:
mode:
authorRamiro Estrugo <ramiro@src.gnome.org>2000-10-20 07:57:21 +0000
committerRamiro Estrugo <ramiro@src.gnome.org>2000-10-20 07:57:21 +0000
commitacb9405f747f5c078b4b70b06216073b628687a9 (patch)
tree73d9e1376c754bf38a5fba8b1f83ac31b02f1ce2 /configure.in
parentfaf5f2f541f35abb29b8e9d79ae5bc67efdd63dd (diff)
downloadnautilus-acb9405f747f5c078b4b70b06216073b628687a9.tar.gz
Update for latest freeype2 rpm changes.
* configure.in: Update for latest freeype2 rpm changes.
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in11
1 files changed, 7 insertions, 4 deletions
diff --git a/configure.in b/configure.in
index 2d6159c0e..d4688b736 100644
--- a/configure.in
+++ b/configure.in
@@ -94,10 +94,16 @@ _found_freetype2_lib="no"
_found_freetype2_header="no"
_found_freetype2="no"
+dnl FIXME
_freetype2_place="/usr"
+_freetype2_include_dir="$_freetype2_place/include/freetype2"
+
+_save_cpp="$CPP"
+CPP="$_save_cpp -I$_freetype2_include_dir"
AC_CHECK_HEADER(freetype/freetype.h, _found_freetype2_header="yes")
AC_CHECK_LIB(freetype, FT_Init_FreeType, [_found_freetype2_lib="yes"])
+CPP="$_save_cpp"
if test "$_found_freetype2_lib" = "yes" -a \
"$_found_freetype2_header" = "yes"
@@ -112,10 +118,7 @@ AC_MSG_ERROR([
*** over here: http://developer.eazel.com/eazel-hacking/updates/freetype2])
fi
-dnl FIXME
-_freetype2_place="/usr"
-
-FREETYPE2_CFLAGS="-I$_freetype2_place/include"
+FREETYPE2_CFLAGS="-I$_freetype2_include_dir"
FREETYPE2_LIBS="-L$_freetype2_place/lib -lfreetype"
AC_SUBST(FREETYPE2_CFLAGS)