From 09652c7f9225b62e9e2436b83ae66ec263cdfe8e Mon Sep 17 00:00:00 2001
From: handa <handa>
Date: Wed, 19 Jul 2006 06:13:19 +0000
Subject: [PATCH] Use pkg-config if available for checking libotf. Include the
 result of `libotf-config --cflags` in CPPFLAGS.

---
 configure.ac |   42 +++++++++++++++++++++++++++---------------
 1 file changed, 27 insertions(+), 15 deletions(-)

diff --git a/configure.ac b/configure.ac
index 38eca1c..6b9bd88 100644
--- a/configure.ac
+++ b/configure.ac
@@ -103,6 +103,8 @@ dnl augmented.
 
 M17N_EXT_LIBS=
 
+AC_CHECK_PROG(HAVE_PKG_CONFIG, pkg-config, yes)
+
 if test "x$no_x" != "xyes"; then
   AC_DEFINE(HAVE_X11, 1, [Define to 1 if you have X11.])
   X11_LD_FLAGS="-lXt -lX11"
@@ -151,22 +153,34 @@ AC_ARG_WITH(libotf,
 if test "x$with_libotf" != "xno"; then
   save_CPPFLAGS="$CPPFLAGS"
   save_LIBS="$LIBS"
-  AC_CHECK_PROG(HAVE_OTFLIB_CONFIG, libotf-config, yes)
-  if test "x$HAVE_OTFLIB_CONFIG" = "xyes"; then
-    CPPFLAGS="$CPPFLAGS `libotf-config --cflags`"
-    OTF_LD_FLAGS="`libotf-config --libs`"
-    LIBS="$LIBS $OTF_LD_FLAGS"
+  if test "x$HAVE_PKG_CONFIG" = "xyes" ; then
+    if pkg-config --exists libotf; then
+      HAVE_OTF=yes
+      CPPFLAGS="$CPPFLAGS `pkg-config --cflags libotf`"
+      OTF_LD_FLAGS="`pkg-config --libs libotf`"
+    else
+      HAVE_OTF=no
+    fi
   else
-    OTF_LD_FLAGS=-lotf
+    AC_CHECK_PROG(HAVE_OTFLIB_CONFIG, libotf-config, yes)
+    if test "x$HAVE_OTFLIB_CONFIG" = "xyes"; then
+      CPPFLAGS="$CPPFLAGS `libotf-config --cflags`"
+      OTF_LD_FLAGS="`libotf-config --libs`"
+      LIBS="$LIBS $OTF_LD_FLAGS"
+    else
+     OTF_LD_FLAGS=-lotf
+    fi
+    ## We check the availability of OTF_check_features
+    ## because we need libotf-0.9.4 or the later.
+    AC_CHECK_LIB(otf, OTF_check_features, HAVE_OTF=yes, HAVE_OTF=no)
+    AC_CHECK_HEADER(otf.h,, HAVE_OTF=no)
+    if test "x$HAVE_OTF" = "xyes"; then
+      AC_DEFINE(HAVE_OTF, 1, 
+	        [Define to 1 if you have OTF library and header file.])
+    fi
   fi
-  ## We check the availability of OTF_check_features
-  ## because we need libotf-0.9.4 or the later.
-  AC_CHECK_LIB(otf, OTF_check_features, HAVE_OTF=yes, HAVE_OTF=no)
-  AC_CHECK_HEADER(otf.h,, HAVE_OTF=no)
   if test "x$HAVE_OTF" = "xyes"; then
-    AC_DEFINE(HAVE_OTF, 1, 
-	      [Define to 1 if you have OTF library and header file.])
-    M17N_EXT_LIBS="$M17N_EXT_LIBS libotf"
+      M17N_EXT_LIBS="$M17N_EXT_LIBS libotf"
   else
     CPPFLAGS="$save_CPPFLAGS"
     OTF_LD_FLAGS=
@@ -207,8 +221,6 @@ if test "x$HAVE_FREETYPE_CONFIG" = "xyes"; then
 fi
 AC_SUBST(FREETYPE_LD_FLAGS)
 
-AC_CHECK_PROG(HAVE_PKG_CONFIG, pkg-config, yes)
-
 dnl Check for Xft2 usability.
 save_CPPFLAGS="$CPPFLAGS"
 save_LIBS="$LIBS"
-- 
1.7.10.4