projects
/
m17n
/
m17n-lib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix comment syntax for doxygen.
[m17n/m17n-lib.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
7356e85
..
b664b66
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-23,10
+23,10
@@
dnl Boston, MA 02110-1301, USA.
dnl Process this file with autoconf to produce a configure script.
dnl Process this file with autoconf to produce a configure script.
-AC_INIT([m17n-lib],[1.6.0],[m17n-lib-bug@m17n.org])
+AC_INIT([m17n-lib],[1.6.2],[m17n-lib-bug@m17n.org])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE
-AC_CONFIG_HEADERS([src/config.h])
+AC_CONFIG_HEADERS([config.h])
AM_MAINTAINER_MODE
API_VERSION=4:0:4
AM_MAINTAINER_MODE
API_VERSION=4:0:4
@@
-39,14
+39,19
@@
M17N_BINARY_VERSION=1.0
M17N_MODULE_DIR="m17n/$M17N_BINARY_VERSION"
AC_SUBST(M17N_MODULE_DIR)
M17N_MODULE_DIR="m17n/$M17N_BINARY_VERSION"
AC_SUBST(M17N_MODULE_DIR)
+
+dnl Checks for programs for compiling.
+AC_PROG_CC
+AC_GNU_SOURCE
+
AM_GNU_GETTEXT
AM_GNU_GETTEXT
+AM_GNU_GETTEXT_VERSION([0.17])
GETTEXTDIR="$datadir/locale"
AC_SUBST(GETTEXTDIR)
GETTEXTDIR="$datadir/locale"
AC_SUBST(GETTEXTDIR)
-dnl Checks for programs for compiling.
-AC_PROG_CC
-LT_PREREQ([2.2.4])
-LT_INIT
+AC_PROG_LIBTOOL
+dnl LT_PREREQ([2.2.4])
+dnl LT_INIT
dnl Checks for X libraries.
AC_PATH_XTRA
dnl Checks for X libraries.
AC_PATH_XTRA
@@
-93,7
+98,7
@@
AC_SUBST(M17NDIR)
dnl Checks which levels of APIs should be compiled.
AC_ARG_ENABLE(gui,
dnl Checks which levels of APIs should be compiled.
AC_ARG_ENABLE(gui,
- AS_HELP_STRING([--with-gui],[with GUI level APIs (default is YES)]))
+ AS_HELP_STRING([--enable-gui],[enable GUI level APIs (default is YES)]))
AM_CONDITIONAL(WITH_GUI, test x$with_gui != xno)
AM_CONDITIONAL(WITH_GUI, test x$with_gui != xno)
@@
-163,12
+168,16
@@
if test "x$with_libotf" != "xno"; then
save_CPPFLAGS="$CPPFLAGS"
save_LIBS="$LIBS"
AC_CHECK_PROG(HAVE_OTFLIB_CONFIG, libotf-config, yes)
save_CPPFLAGS="$CPPFLAGS"
save_LIBS="$LIBS"
AC_CHECK_PROG(HAVE_OTFLIB_CONFIG, libotf-config, yes)
+ OTF_LD_FLAGS=-lotf
if test "x$HAVE_OTFLIB_CONFIG" = "xyes"; then
CPPFLAGS="$CPPFLAGS `libotf-config --cflags`"
OTF_LD_FLAGS="`libotf-config --libs`"
LIBS="$LIBS $OTF_LD_FLAGS"
if test "x$HAVE_OTFLIB_CONFIG" = "xyes"; then
CPPFLAGS="$CPPFLAGS `libotf-config --cflags`"
OTF_LD_FLAGS="`libotf-config --libs`"
LIBS="$LIBS $OTF_LD_FLAGS"
- else
- OTF_LD_FLAGS=-lotf
+ elif test "x$HAVE_PKG_CONFIG" = "xyes" ; then
+ if pkg-config libotf ; then
+ CPPFLAGS="$CPPFLAGS `pkg-config --cflags libotf`"
+ OTF_LD_FLAGS="`pkg-config --libs libotf`"
+ fi
fi
## We check the availability of OTF_check_features
## because we need libotf-0.9.4 or the later.
fi
## We check the availability of OTF_check_features
## because we need libotf-0.9.4 or the later.
@@
-439,7
+448,7
@@
esac
AC_DEFINE_UNQUOTED(DLOPEN_SHLIB_EXT, "$SHLIB_EXT",
[Define to loadable module extention])
AC_DEFINE_UNQUOTED(DLOPEN_SHLIB_EXT, "$SHLIB_EXT",
[Define to loadable module extention])
-AC_CONFIG_FILES([Makefile po/Makefile.in intl/Makefile
+AC_CONFIG_FILES([Makefile intl/Makefile po/Makefile.in
src/Makefile
example/Makefile
m17n-config
src/Makefile
example/Makefile
m17n-config