summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2007-02-23 19:00:29 +0000
committerChris Wilson <cpwilson@src.gnome.org>2007-02-23 19:00:29 +0000
commit26deb3f942b4916864f8ba81397c5c0456d93e6a (patch)
treec8cdf1e59cea45c670cbb839c6d63c1fe567ebbb
parent39eb40adc143e140be920ba39777780bb06daf1f (diff)
downloadvte-26deb3f942b4916864f8ba81397c5c0456d93e6a.tar.gz
Bug 411276 – SVN trunk compilation error Part 2.
2007-02-23 Chris Wilson <chris@chris-wilson.co.uk> Bug 411276 – SVN trunk compilation error Part 2. * configure.in: Check that the header file defines FcStrFree before checking for the availability of the function. Complete hack, but appears to work. svn path=/trunk/; revision=1735
-rw-r--r--ChangeLog10
-rw-r--r--configure.in10
2 files changed, 19 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 22cf3419..5d960320 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,16 @@
2007-02-23 Chris Wilson <chris@chris-wilson.co.uk>
Bug 411276 – SVN trunk compilation error
+ Part 2.
+
+ * configure.in:
+ Check that the header file defines FcStrFree before checking
+ for the availability of the function. Complete hack, but
+ appears to work.
+
+2007-02-23 Chris Wilson <chris@chris-wilson.co.uk>
+
+ Bug 411276 – SVN trunk compilation error
* configure.in:
Ubuntu Edgy appears to have a broken fontconfig-dev package
diff --git a/configure.in b/configure.in
index f17c7c54..655def65 100644
--- a/configure.in
+++ b/configure.in
@@ -361,7 +361,15 @@ save_CFLAGS="$CFLAGS"
save_LIBS="$LIBS"
CFLAGS="$CFLAGS $VTE_CFLAGS"
LIBS="$VTE_LIBS $LIBS"
-AC_CHECK_FUNCS([FcNameUnparse FcStrFree])
+# Workaround a broken fontconfig-dev on Edgy
+AC_COMPILE_IFELSE([
+#include <fontconfig/fontconfig.h>
+int main(void)
+{
+ FcStrFree (FcNameUnparse (0));
+ return 0;
+}
+], [AC_CHECK_FUNCS([FcNameUnparse FcStrFree])],)
LIBS="$save_LIBS"
CFLAGS="$save_CFLAGS"