Revision: 6287
Author: ek.kato
Date: Wed Mar 24 22:44:18 2010
Log: * Merge r6207, r6208, r6214 from trunk.
http://code.google.com/p/uim/source/detail?r=6287
Modified:
/branches/1.5/configure.ac
/branches/1.5/qt4/candwin/uim-candwin-qt4.pro.in
/branches/1.5/qt4/chardict/uim-chardict-qt4.pro.in
/branches/1.5/qt4/immodule/quiminputcontextplugin.pro.in
/branches/1.5/qt4/pref/uim-pref-qt4.pro.in
/branches/1.5/qt4/switcher/uim-im-switcher-qt4.pro.in
/branches/1.5/qt4/toolbar/uim-toolbar-qt4.pro.in
=======================================
--- /branches/1.5/configure.ac Mon Dec 21 17:22:21 2009
+++ /branches/1.5/configure.ac Wed Mar 24 22:44:18 2010
@@ -686,6 +686,7 @@
AC_DEFINE_UNQUOTED(DATADIR, "$DATADIR", [read-only
architecture-independent data dir])
UIM_LIBEXECDIR=`eval echo "${libexecdir}"`
AC_DEFINE_UNQUOTED(UIM_LIBEXECDIR, "$UIM_LIBEXECDIR", [libexec dir])
+AC_SUBST(UIM_LIBEXECDIR)
# we should use more safe macro such as AC_EXPAND_DIR
LOCALEDIR=`eval eval echo ${datadir}/locale`
# backward compatibility
=======================================
--- /branches/1.5/qt4/candwin/uim-candwin-qt4.pro.in Sun Dec 27 17:11:25
2009
+++ /branches/1.5/qt4/candwin/uim-candwin-qt4.pro.in Wed Mar 24 22:44:18
2010
@@ -9,7 +9,7 @@
QMAKE_LIBDIR += @abs_top_builddir@/replace
QMAKE_LIBDIR += @abs_top_builddir@/uim/.libs
QMAKE_LIBDIR += @abs_top_builddir@/replace/.libs
-LIBS += -lreplace -luim -luim-scm -luim-x-util
+LIBS += -lreplace -luim -luim-scm -luim-x-util @LIBINTL@
QMAKE_CFLAGS_DEBUG += @CFLAGS@ @X_CFLAGS@
QMAKE_CFLAGS_RELEASE += @CFLAGS@ @X_CFLAGS@
@@ -22,5 +22,5 @@
TARGET = uim-candwin-qt4
-target.path += @DESTDIR@@libexecdir@
+target.path += @DESTDIR@@UIM_LIBEXECDIR@
INSTALLS += target
=======================================
--- /branches/1.5/qt4/chardict/uim-chardict-qt4.pro.in Sat Nov 21 04:55:15
2009
+++ /branches/1.5/qt4/chardict/uim-chardict-qt4.pro.in Wed Mar 24 22:44:18
2010
@@ -8,7 +8,7 @@
QMAKE_LIBDIR += @abs_top_builddir@/replace
QMAKE_LIBDIR += @abs_top_builddir@/uim/.libs
QMAKE_LIBDIR += @abs_top_builddir@/replace/.libs
-LIBS += -lreplace -luim -luim-scm -luim-x-util
+LIBS += -lreplace -luim -luim-scm -luim-x-util @LIBINTL@
QMAKE_CFLAGS_DEBUG += @CFLAGS@ @X_CFLAGS@
QMAKE_CFLAGS_RELEASE += @CFLAGS@ @X_CFLAGS@
=======================================
--- /branches/1.5/qt4/immodule/quiminputcontextplugin.pro.in Sun Oct 25
22:47:09 2009
+++ /branches/1.5/qt4/immodule/quiminputcontextplugin.pro.in Wed Mar 24
22:44:18 2010
@@ -15,7 +15,7 @@
# static libraries directly
QMAKE_LIBDIR += @abs_top_builddir@/replace/.libs
QMAKE_LIBDIR += @abs_top_builddir@/uim/.libs
-LIBS += -lreplace -luim -luim-scm -luim-x-util
+LIBS += -lreplace -luim -luim-scm -luim-x-util @X11_LIBS@
QMAKE_CFLAGS_DEBUG += @CFLAGS@ @X_CFLAGS@
QMAKE_CFLAGS_RELEASE += @CFLAGS@ @X_CFLAGS@
=======================================
--- /branches/1.5/qt4/pref/uim-pref-qt4.pro.in Sat Nov 21 04:55:15 2009
+++ /branches/1.5/qt4/pref/uim-pref-qt4.pro.in Wed Mar 24 22:44:18 2010
@@ -8,7 +8,7 @@
QMAKE_LIBDIR += @abs_top_builddir@/replace
QMAKE_LIBDIR += @abs_top_builddir@/uim/.libs
QMAKE_LIBDIR += @abs_top_builddir@/replace/.libs
-LIBS += -lreplace -luim -luim-scm -luim-x-util -luim-custom
-luim-counted-init
+LIBS += -lreplace -luim -luim-scm -luim-x-util -luim-custom
-luim-counted-init @LIBINTL@
QMAKE_CFLAGS_DEBUG += @CFLAGS@ @X_CFLAGS@
QMAKE_CFLAGS_RELEASE += @CFLAGS@ @X_CFLAGS@
=======================================
--- /branches/1.5/qt4/switcher/uim-im-switcher-qt4.pro.in Sat Nov 21
04:55:15 2009
+++ /branches/1.5/qt4/switcher/uim-im-switcher-qt4.pro.in Wed Mar 24
22:44:18 2010
@@ -8,7 +8,7 @@
QMAKE_LIBDIR += @abs_top_builddir@/replace
QMAKE_LIBDIR += @abs_top_builddir@/uim/.libs
QMAKE_LIBDIR += @abs_top_builddir@/replace/.libs
-LIBS += -lreplace -luim -luim-scm -luim-x-util
+LIBS += -lreplace -luim -luim-scm -luim-x-util @LIBINTL@
QMAKE_CFLAGS_DEBUG += @CFLAGS@ @X_CFLAGS@
QMAKE_CFLAGS_RELEASE += @CFLAGS@ @X_CFLAGS@
=======================================
--- /branches/1.5/qt4/toolbar/uim-toolbar-qt4.pro.in Sat Nov 21 04:55:15
2009
+++ /branches/1.5/qt4/toolbar/uim-toolbar-qt4.pro.in Wed Mar 24 22:44:18
2010
@@ -8,7 +8,7 @@
QMAKE_LIBDIR += @abs_top_builddir@/replace
QMAKE_LIBDIR += @abs_top_builddir@/uim/.libs
QMAKE_LIBDIR += @abs_top_builddir@/replace/.libs
-LIBS += -lreplace -luim -luim-scm -luim-x-util
+LIBS += -lreplace -luim -luim-scm -luim-x-util @LIBINTL@
QMAKE_CFLAGS_DEBUG += @CFLAGS@ @X_CFLAGS@
QMAKE_CFLAGS_RELEASE += @CFLAGS@ @X_CFLAGS@
To unsubscribe from this group, send email to uim-commit+unsubscribegooglegroups.com or
reply to this email with the words "REMOVE ME" as the subject.
