Only check for m17n-flt if HAVE_LIBOTF.

6b0262c1 · Andreas Schwab · 006793d0 · 6b0262c1 · 6b0262c1 · 6b0262c1
Commit 6b0262c1 authored Oct 12, 2008 by Andreas Schwab
Hide whitespace changes
Inline Side-by-side

Showing with 18 additions and 14 deletions

ChangeLog ChangeLog +4 -0

configure configure +8 -10

configure.in configure.in +6 -4

No files found.
--- a/ChangeLog
+++ b/ChangeLog
+2008-10-12  Andreas Schwab  <schwab@suse.de>
+
+	* configure.in: Only check for m17n-flt if HAVE_LIBOTF.
+
 2008-08-28  Adrian Robert  <Adrian.B.Robert@gmail.com>

 	* configure.in: Report USE_TOOLKIT_SCROLLBARS as such (not mentioning

--- a/configure
+++ b/configure
@@ -13181,7 +13181,8 @@ _ACEOF
 fi
  
 HAVE_M17N_FLT=no
-if test "${with_m17n_flt}" != "no"; then
+if test "${HAVE_LIBOTF}" = yes; then
+  if test "${with_m17n_flt}" != "no"; then
  
  succeeded=no
  
@@ -13276,12 +13277,13 @@ echo "${ECHO_T}no" >&6; }
     HAVE_M17N_FLT=no
  fi
  
-  if test "$HAVE_M17N_FLT" = "yes"; then
+    if test "$HAVE_M17N_FLT" = "yes"; then
  
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_M17N_FLT 1
 _ACEOF
  
+    fi
  fi
 fi
  
@@ -18746,13 +18748,11 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <sys/types.h> /* for off_t */
-     #include <stdio.h>
+#include <stdio.h>
 int
 main ()
 {
-int (*fp) (FILE *, off_t, int) = fseeko;
-     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
+return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
  ;
  return 0;
 }
@@ -18792,13 +18792,11 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #define _LARGEFILE_SOURCE 1
-#include <sys/types.h> /* for off_t */
-     #include <stdio.h>
+#include <stdio.h>
 int
 main ()
 {
-int (*fp) (FILE *, off_t, int) = fseeko;
-     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
+return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
  ;
  return 0;
 }

--- a/configure.in
+++ b/configure.in
@@ -1876,10 +1876,12 @@ dnl Does the new font backend require it, or can it work without it?
 fi

 HAVE_M17N_FLT=no
-if test "${with_m17n_flt}" != "no"; 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 using libm17n-flt.])
+if test "${HAVE_LIBOTF}" = yes; then
+  if test "${with_m17n_flt}" != "no"; 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 using libm17n-flt.])
+    fi
  fi
 fi