Mercurial > emacs
changeset 91148:293155ed2cf4
Re-generated.
author | Kenichi Handa <handa@m17n.org> |
---|---|
date | Sat, 01 Dec 2007 02:44:40 +0000 |
parents | 6d4d49b30716 |
children | 75910f1968b3 |
files | configure |
diffstat | 1 files changed, 133 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Sat Dec 01 02:43:56 2007 +0000 +++ b/configure Sat Dec 01 02:44:40 2007 +0000 @@ -701,6 +701,8 @@ HAVE_LIBOTF LIBOTF_CFLAGS LIBOTF_LIBS +M17N_FLT_CFLAGS +M17N_FLT_LIBS ALLOCA liblockfile LIBOBJS @@ -13430,6 +13432,118 @@ +if test "X${with_pkg_config_prog}" != X; then + PKG_CONFIG="${with_pkg_config_prog}" +fi + + succeeded=no + + if test -z "$PKG_CONFIG"; then + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + + fi + + if test "$PKG_CONFIG" = "no" ; then + pkg_check_m17n_flt=no + else + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + { echo "$as_me:$LINENO: checking for m17n-flt" >&5 +echo $ECHO_N "checking for m17n-flt... $ECHO_C" >&6; } + + if $PKG_CONFIG --exists "m17n-flt" 2>&5; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + succeeded=yes + + { echo "$as_me:$LINENO: checking M17N_FLT_CFLAGS" >&5 +echo $ECHO_N "checking M17N_FLT_CFLAGS... $ECHO_C" >&6; } + M17N_FLT_CFLAGS=`$PKG_CONFIG --cflags "m17n-flt"|sed -e 's,///*,/,g'` + { echo "$as_me:$LINENO: result: $M17N_FLT_CFLAGS" >&5 +echo "${ECHO_T}$M17N_FLT_CFLAGS" >&6; } + + { echo "$as_me:$LINENO: checking M17N_FLT_LIBS" >&5 +echo $ECHO_N "checking M17N_FLT_LIBS... $ECHO_C" >&6; } + M17N_FLT_LIBS=`$PKG_CONFIG --libs "m17n-flt"|sed -e 's,///*,/,g'` + { echo "$as_me:$LINENO: result: $M17N_FLT_LIBS" >&5 +echo "${ECHO_T}$M17N_FLT_LIBS" >&6; } + else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + M17N_FLT_CFLAGS="" + M17N_FLT_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + M17N_FLT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "m17n-flt"` + + fi + + + + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi + + if test $succeeded = yes; then + pkg_check_m17n_flt=yes + else + pkg_check_m17n_flt=no + fi + +if test "$pkg_check_m17n_flt" = "yes"; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_M17N_FLT 1 +_ACEOF + + + + C_SWITCH_X_SITE="$C_SWITCH_X_SITE $M17N_FLT_CFLAGS" + CFLAGS="$CFLAGS $M17N_FLT_CFLAGS" + LIBS="$LIBS $M17N_FLT_LIBS" +fi + fi ### Use -lXpm if available, unless `--with-xpm=no'. @@ -18848,11 +18962,13 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <stdio.h> -int -main () -{ -return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0); +#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); ; return 0; } @@ -18892,11 +19008,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #define _LARGEFILE_SOURCE 1 -#include <stdio.h> -int -main () -{ -return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0); +#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); ; return 0; } @@ -24993,6 +25111,8 @@ HAVE_LIBOTF!$HAVE_LIBOTF$ac_delim LIBOTF_CFLAGS!$LIBOTF_CFLAGS$ac_delim LIBOTF_LIBS!$LIBOTF_LIBS$ac_delim +M17N_FLT_CFLAGS!$M17N_FLT_CFLAGS$ac_delim +M17N_FLT_LIBS!$M17N_FLT_LIBS$ac_delim ALLOCA!$ALLOCA$ac_delim liblockfile!$liblockfile$ac_delim LIBOBJS!$LIBOBJS$ac_delim @@ -25003,8 +25123,6 @@ GETOPTOBJS!$GETOPTOBJS$ac_delim version!$version$ac_delim configuration!$configuration$ac_delim -canonical!$canonical$ac_delim -srcdir!$srcdir$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -25046,6 +25164,8 @@ ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +canonical!$canonical$ac_delim +srcdir!$srcdir$ac_delim lispdir!$lispdir$ac_delim locallisppath!$locallisppath$ac_delim lisppath!$lisppath$ac_delim @@ -25067,7 +25187,7 @@ LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 19; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 21; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5