Mercurial > emacs
changeset 98654:015e43fe3098
Only check for m17n-flt if HAVE_LIBOTF.
| author | Andreas Schwab <schwab@suse.de> |
|---|---|
| date | Sun, 12 Oct 2008 12:47:22 +0000 |
| parents | 3553ffaa9490 |
| children | 29b77fe23d01 |
| files | ChangeLog configure configure.in |
| diffstat | 3 files changed, 24 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sun Oct 12 11:53:26 2008 +0000 +++ b/ChangeLog Sun Oct 12 12:47:22 2008 +0000 @@ -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
--- a/configure Sun Oct 12 11:53:26 2008 +0000 +++ b/configure Sun Oct 12 12:47:22 2008 +0000 @@ -13181,7 +13181,8 @@ 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 @@ 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 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <sys/types.h> /* for off_t */ - #include <stdio.h> -int -main () -{ -int (*fp) (FILE *, off_t, int) = fseeko; - return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); +#include <stdio.h> +int +main () +{ +return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0); ; return 0; } @@ -18792,13 +18792,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #define _LARGEFILE_SOURCE 1 -#include <sys/types.h> /* for off_t */ - #include <stdio.h> -int -main () -{ -int (*fp) (FILE *, off_t, int) = fseeko; - return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); +#include <stdio.h> +int +main () +{ +return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0); ; return 0; }
--- a/configure.in Sun Oct 12 11:53:26 2008 +0000 +++ b/configure.in Sun Oct 12 12:47:22 2008 +0000 @@ -1876,10 +1876,12 @@ 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