Mercurial > emacs
changeset 91474:e086fbb9f3a1
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.
| author | Thien-Thi Nguyen <ttn@gnuvola.org> |
|---|---|
| date | Sat, 02 Feb 2008 20:46:40 +0000 |
| parents | d9afb7a33dc0 |
| children | 33add55814c9 |
| files | ChangeLog configure configure.in |
| diffstat | 3 files changed, 28 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat Feb 02 18:42:05 2008 +0000 +++ b/ChangeLog Sat Feb 02 20:46:40 2008 +0000 @@ -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
--- a/configure Sat Feb 02 18:42:05 2008 +0000 +++ b/configure Sat Feb 02 20:46:40 2008 +0000 @@ -13042,7 +13042,7 @@ 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 @@ fi if test $succeeded = yes; then - pkg_check_libotf=yes - else - pkg_check_libotf=no - fi - - if test "$pkg_check_libotf" = "yes"; then + HAVE_LIBOTF=yes + else + HAVE_LIBOTF=no + fi + + if test "$HAVE_LIBOTF" = "yes"; then cat >>confdefs.h <<\_ACEOF #define HAVE_LIBOTF 1 @@ -13151,7 +13151,7 @@ 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 @@ 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 + HAVE_M17N_FLT=yes + else + HAVE_M17N_FLT=no + fi + + if test "$HAVE_M17N_FLT" = "yes"; then cat >>confdefs.h <<\_ACEOF #define HAVE_M17N_FLT 1
--- a/configure.in Sat Feb 02 18:42:05 2008 +0000 +++ b/configure.in Sat Feb 02 20:46:40 2008 +0000 @@ -2083,9 +2083,9 @@ 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 @@ 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