~ubuntu-branches/ubuntu/precise/uim/precise

« back to all changes in this revision

Viewing changes to xim/Makefile.am

  • Committer: Package Import Robot
  • Author(s): Ilya Barygin
  • Date: 2011-12-18 16:35:38 UTC
  • mfrom: (1.1.13) (15.1.7 sid)
  • Revision ID: package-import@ubuntu.com-20111218163538-8ktir39z2mjpii8z
Tags: 1:1.7.1-3ubuntu1
* Merge from Debian testing (LP: #818199).
* Remaining changes:
  - debian/uim-qt.install: Fix plugin path for multiarch location.
* Dropped changes:
  - uim-applet-gnome removal (GNOME 3 applet is available)
  - 19_as-needed_compile_fix.dpatch (accepted into Debian package)
* translations.patch: add several files to POTFILE.in to prevent
  intltool-update failure.

Show diffs side-by-side

added added

removed removed

Lines of Context:
15
15
if DEFAULT_TOOLKIT_GTK
16
16
uim_xim_CPPFLAGS += -DUSE_GTK_CANDWIN
17
17
endif
 
18
if DEFAULT_TOOLKIT_GTK3
 
19
uim_xim_CPPFLAGS += -DUSE_GTK3_CANDWIN
 
20
endif
18
21
if DEFAULT_TOOLKIT_QT
19
22
uim_xim_CPPFLAGS += -DUSE_QT_CANDWIN
20
23
endif
 
24
if DEFAULT_TOOLKIT_QT4
 
25
uim_xim_CPPFLAGS += -DUSE_QT4_CANDWIN
 
26
endif
21
27
 
22
28
if WITH_XFT
23
29
uim_xim_CFLAGS += @XFT_CFLAGS@