diff options
| author | fujiwarat <takao.fujiwara1@gmail.com> | 2013-01-07 12:42:50 +0900 |
|---|---|---|
| committer | fujiwarat <takao.fujiwara1@gmail.com> | 2013-01-07 12:42:50 +0900 |
| commit | c60ece97c3751cfcee0e2bf98ea19971623fa8b1 (patch) | |
| tree | 6f159b63a373a720b59813bf2b9d333e91108c1d | |
| parent | 93a85649a556d52f688df1fc818bf4b910cec1c5 (diff) | |
| download | ibus-anthy-c60ece97c3751cfcee0e2bf98ea19971623fa8b1.tar.gz | |
Cleaned up configure.ac and added anthy.i in tarball (#1571)
Patch is provided by galtgendo [at] gmail [dot] com
| -rwxr-xr-x | autogen.sh | 2 | ||||
| -rw-r--r-- | configure.ac | 11 | ||||
| -rw-r--r-- | engine/Makefile.am | 5 |
3 files changed, 7 insertions, 11 deletions
@@ -11,4 +11,4 @@ automake --add-missing --copy --force || exit 1 autoconf --force || exit 1 export CFLAGS="-Wall -g -O0 -Wl,--no-undefined" export CXXFLAGS="$CFLAGS" -./configure --enable-maintainer-mode "$@" || exit 1 +./configure "$@" || exit 1 diff --git a/configure.ac b/configure.ac index 7a4ca49..66b045d 100644 --- a/configure.ac +++ b/configure.ac @@ -47,15 +47,14 @@ dnl - define PACKAGE_VERSION_* variables AS_VERSION AS_NANO AM_SANITY_CHECK -AM_MAINTAINER_MODE -AM_DISABLE_STATIC +AM_MAINTAINER_MODE(enable) +AC_DISABLE_STATIC AC_PROG_CC AM_PROG_CC_C_O AC_PROG_CXX -AC_ISC_POSIX AC_HEADER_STDC -AM_PROG_LIBTOOL -IT_PROG_INTLTOOL([0.35.0]) +AC_PROG_LIBTOOL +IT_PROG_INTLTOOL([0.41.1]) dnl - For dislpay Date m4_define(ibus_datedisplay, @@ -211,7 +210,7 @@ AC_MSG_CHECKING([whether you enable pygtk2 anthy]) AC_ARG_ENABLE(pygtk2-anthy, AS_HELP_STRING([--enable-pygtk2-anthy=no/yes], [Install pygtk2 anthy default=no]), - enable_pygtk2_anthy=yes, + [], enable_pygtk2_anthy=no) AC_MSG_RESULT($enable_pygtk2_anthy) diff --git a/engine/Makefile.am b/engine/Makefile.am index 4ea3f1e..5a33b8f 100644 --- a/engine/Makefile.am +++ b/engine/Makefile.am @@ -38,10 +38,10 @@ engine_anthydir = $(pkgdatadir)/engine engine_anthy_built_files = $(BUILT_SOURCES) engine_anthy_built_in_files = $(addsuffix .in, $(engine_anthy_built_files)) -if HAVE_PYGTK2_ANTHY PYGTK2_ANTHY_RAW = anthy.i PYGTK2_ANTHY_GEN = anthy.py anthy_wrap.c +if HAVE_PYGTK2_ANTHY anthy_DATA = \ anthy.py \ $(NULL) @@ -69,9 +69,6 @@ _anthy_la_LDFLAGS = \ anthy.py anthy_wrap.c: anthy.i $(SWIG) -python $(ANTHY_CFLAGS) -I/usr/include -o anthy_wrap.c $(srcdir)/anthy.i -else -PYGTK2_ANTHY_RAW = -PYGTK2_ANTHY_GEN = endif libexec_SCRIPTS = ibus-engine-anthy |