[patch] fix minor build system issues

my-fixes.patch (text/plain), 1.54 KB, created by Rafał Mużyło on 2013-01-02 07:35:24 UTC

--- a/configure.ac	2012-12-16 17:35:58.000000000 +0100
+++ b/configure.ac	2012-12-30 16:46:23.000000000 +0100
@@ -47,15 +47,14 @@ dnl - define PACKAGE_VERSION_* variables
 AS_VERSION
 AS_NANO
 AM_SANITY_CHECK
+AM_MAINTAINER_MODE(enable)
+AC_DISABLE_STATIC
-AM_MAINTAINER_MODE
-AM_DISABLE_STATIC
 AC_PROG_CC
 AM_PROG_CC_C_O
 AC_PROG_CXX
-AC_ISC_POSIX
 AC_HEADER_STDC
+AC_PROG_LIBTOOL
+IT_PROG_INTLTOOL([0.41.1])
-AM_PROG_LIBTOOL
-IT_PROG_INTLTOOL([0.35.0])
 
 dnl - For dislpay Date
 m4_define(ibus_datedisplay,
@@ -210,7 +211,7 @@ AC_MSG_CHECKING([whether you enable pygt
 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)
 
--- a/engine/Makefile.am	2012-12-16 17:31:02.000000000 +0100
+++ b/engine/Makefile.am	2012-12-30 16:46:13.000000000 +0100
@@ -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