From: Thien-Thi Nguyen <ttn@gnuvola.org>
Date: Sat, 2 Feb 2008 20:46:40 +0000 (+0000)
Subject: Arrange for innards to jive w/ summary for libotf and m17n-flt.
X-Git-Tag: emacs-pretest-23.0.90~8225
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=435f8bc50e4868a107f87606c97696c5ae10bc18;p=emacs.git

Arrange for innards to jive w/ summary for libotf and m17n-flt.

* configure.in: For libotf and m17n-flt checks, set shell vars
HAVE_LIBOTF and HAVE_M17N_FLT instead of pkg_check_libotf and
pkg_check_m17n_flt, respectively, for the sake of the summary output.
* configure: Regenerated.
---

diff --git a/ChangeLog b/ChangeLog
index 09fd6e49d97..79495e95176 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-02-02  Thien-Thi Nguyen  <ttn@gnuvola.org>
+
+	* configure.in: For libotf and m17n-flt checks, set shell vars
+	HAVE_LIBOTF and HAVE_M17N_FLT instead of pkg_check_libotf and
+	pkg_check_m17n_flt, respectively, for the sake of the summary output.
+	Reported by Ulrich Mueller.
+	* configure: Regenerated.
+
 2008-02-02  Eli Zaretskii  <eliz@gnu.org>
 
 	* configure.in: If admin/unidata/UnicodeData.txt is present, copy
diff --git a/configure b/configure
index 9708c4e44a5..84369d0c041 100755
--- a/configure
+++ b/configure
@@ -13042,7 +13042,7 @@ fi
 
 
   if test "$PKG_CONFIG" = "no" ; then
-     pkg_check_libotf=no
+     HAVE_LIBOTF=no
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
@@ -13085,12 +13085,12 @@ echo "${ECHO_T}no" >&6; }
   fi
 
   if test $succeeded = yes; then
-     pkg_check_libotf=yes
+     HAVE_LIBOTF=yes
   else
-     pkg_check_libotf=no
+     HAVE_LIBOTF=no
   fi
 
-    if test "$pkg_check_libotf" = "yes"; then
+    if test "$HAVE_LIBOTF" = "yes"; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_LIBOTF 1
@@ -13151,7 +13151,7 @@ fi
 
 
   if test "$PKG_CONFIG" = "no" ; then
-     pkg_check_m17n_flt=no
+     HAVE_M17N_FLT=no
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
@@ -13194,12 +13194,12 @@ echo "${ECHO_T}no" >&6; }
   fi
 
   if test $succeeded = yes; then
-     pkg_check_m17n_flt=yes
+     HAVE_M17N_FLT=yes
   else
-     pkg_check_m17n_flt=no
+     HAVE_M17N_FLT=no
   fi
 
-  if test "$pkg_check_m17n_flt" = "yes"; then
+  if test "$HAVE_M17N_FLT" = "yes"; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_M17N_FLT 1
diff --git a/configure.in b/configure.in
index c0e5a77dd36..cded82a68d3 100644
--- a/configure.in
+++ b/configure.in
@@ -2083,9 +2083,9 @@ if test "${HAVE_FREETYPE}" = "yes"; then
     if test "X${with_pkg_config_prog}" != X; then
       PKG_CONFIG="${with_pkg_config_prog}"
     fi
-    PKG_CHECK_MODULES(LIBOTF, libotf, pkg_check_libotf=yes, 
-                      pkg_check_libotf=no)
-    if test "$pkg_check_libotf" = "yes"; then
+    PKG_CHECK_MODULES(LIBOTF, libotf, HAVE_LIBOTF=yes, 
+                      HAVE_LIBOTF=no)
+    if test "$HAVE_LIBOTF" = "yes"; then
       AC_DEFINE(HAVE_LIBOTF, 1,
                 [Define to 1 if you have libotf library.])
     fi
@@ -2099,9 +2099,9 @@ if test "${with_m17n_flt}" != "no"; then
     PKG_CONFIG="${with_pkg_config_prog}"
   fi
   dnl Checks for libraries.
-  PKG_CHECK_MODULES(M17N_FLT, m17n-flt, pkg_check_m17n_flt=yes, 
-                    pkg_check_m17n_flt=no)
-  if test "$pkg_check_m17n_flt" = "yes"; then
+  PKG_CHECK_MODULES(M17N_FLT, m17n-flt, HAVE_M17N_FLT=yes, 
+                    HAVE_M17N_FLT=no)
+  if test "$HAVE_M17N_FLT" = "yes"; then
     AC_DEFINE(HAVE_M17N_FLT, 1,
               [Define to 1 if you have m17n-flt library.])
   fi