diff options
| author | Andreas Schwab <schwab@suse.de> | 2008-10-12 12:47:22 +0000 |
|---|---|---|
| committer | Andreas Schwab <schwab@suse.de> | 2008-10-12 12:47:22 +0000 |
| commit | f17ef625676168a2216425b612d0e5590f2e5e9f (patch) | |
| tree | 241eab51fc9ba01f1ccd0fe7962e718f6287c483 | |
| parent | 472254537a89d0e217e303912091af57dfe680ce (diff) | |
| download | emacs-f17ef625676168a2216425b612d0e5590f2e5e9f.tar.gz | |
Only check for m17n-flt if HAVE_LIBOTF.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rwxr-xr-x | configure | 18 | ||||
| -rw-r--r-- | configure.in | 10 |
3 files changed, 18 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog index bab931331aa..aaa023442fb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +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 diff --git a/configure b/configure index 072df70e6a2..9995b710e08 100755 --- 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; } diff --git a/configure.in b/configure.in index ead577f5246..0807fb9f02c 100644 --- 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 |