summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2000-12-20 19:20:05 +0000
committerHavoc Pennington <hp@src.gnome.org>2000-12-20 19:20:05 +0000
commitc1ed9d98350040f057abfb87412517d650738e52 (patch)
tree3908efb52984fe080b9765a08b549484b4b72d5d
parent6ffa65f461d8a78d9190c0d9903a9ecd7273774a (diff)
downloadpango-c1ed9d98350040f057abfb87412517d650738e52.tar.gz
fix freetype check a bit
2000-12-20 Havoc Pennington <hp@redhat.com> * configure.in: fix freetype check a bit
-rw-r--r--ChangeLog4
-rw-r--r--ChangeLog.pre-1-04
-rw-r--r--ChangeLog.pre-1-104
-rw-r--r--ChangeLog.pre-1-24
-rw-r--r--ChangeLog.pre-1-44
-rw-r--r--ChangeLog.pre-1-64
-rw-r--r--ChangeLog.pre-1-84
-rw-r--r--configure.in6
8 files changed, 31 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 8f49dfe6..71344f27 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-12-20 Havoc Pennington <hp@redhat.com>
+
+ * configure.in: fix freetype check a bit
+
Tue Dec 19 22:47:16 2000 Owen Taylor <otaylor@redhat.com>
* configure.in pango-config.in pangoxft.pc.in
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index 8f49dfe6..71344f27 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,7 @@
+2000-12-20 Havoc Pennington <hp@redhat.com>
+
+ * configure.in: fix freetype check a bit
+
Tue Dec 19 22:47:16 2000 Owen Taylor <otaylor@redhat.com>
* configure.in pango-config.in pangoxft.pc.in
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 8f49dfe6..71344f27 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,7 @@
+2000-12-20 Havoc Pennington <hp@redhat.com>
+
+ * configure.in: fix freetype check a bit
+
Tue Dec 19 22:47:16 2000 Owen Taylor <otaylor@redhat.com>
* configure.in pango-config.in pangoxft.pc.in
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 8f49dfe6..71344f27 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,7 @@
+2000-12-20 Havoc Pennington <hp@redhat.com>
+
+ * configure.in: fix freetype check a bit
+
Tue Dec 19 22:47:16 2000 Owen Taylor <otaylor@redhat.com>
* configure.in pango-config.in pangoxft.pc.in
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 8f49dfe6..71344f27 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,7 @@
+2000-12-20 Havoc Pennington <hp@redhat.com>
+
+ * configure.in: fix freetype check a bit
+
Tue Dec 19 22:47:16 2000 Owen Taylor <otaylor@redhat.com>
* configure.in pango-config.in pangoxft.pc.in
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 8f49dfe6..71344f27 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,7 @@
+2000-12-20 Havoc Pennington <hp@redhat.com>
+
+ * configure.in: fix freetype check a bit
+
Tue Dec 19 22:47:16 2000 Owen Taylor <otaylor@redhat.com>
* configure.in pango-config.in pangoxft.pc.in
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 8f49dfe6..71344f27 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,7 @@
+2000-12-20 Havoc Pennington <hp@redhat.com>
+
+ * configure.in: fix freetype check a bit
+
Tue Dec 19 22:47:16 2000 Owen Taylor <otaylor@redhat.com>
* configure.in pango-config.in pangoxft.pc.in
diff --git a/configure.in b/configure.in
index c4ac9fc8..e81c5c47 100644
--- a/configure.in
+++ b/configure.in
@@ -53,9 +53,9 @@ FREETYPE_LIBS=
FREETYPE_CFLAGS=
have_freetype=false
AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)
-if test "x$FREE_CONFIG" != "xno" ; then
- FREETYPE_CFLAGS=`freetype-config --cflags`
- FREETYPE_LIBS=`freetype-config --libs`
+if test "x$FREETYPE_CONFIG" != "xno" ; then
+ FREETYPE_CFLAGS=`$FREETYPE_CONFIG --cflags`
+ FREETYPE_LIBS=`$FREETYPE_CONFIG --libs`
AC_CHECK_LIB(freetype, FT_New_Face, have_freetype=true
,:,$FREETYPE_LIBS)