Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(343)

Side by Side Diff: configure.ac

Issue 1539001: Reimplement ibus-gconf so it does not depend on GConf-2 database (Closed)
Patch Set: fix Created 10 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « README.chromium ('k') | memconf/Makefile.am » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # vim:set et ts=4: 1 # vim:set et ts=4:
2 # 2 #
3 # ibus - The Input Bus 3 # ibus - The Input Bus
4 # 4 #
5 # Copyright (c) 2007-2010 Peng Huang <shawn.p.huang@gmail.com> 5 # Copyright (c) 2007-2010 Peng Huang <shawn.p.huang@gmail.com>
6 # Copyright (c) 2007-2010 Red Hat, Inc. 6 # Copyright (c) 2007-2010 Red Hat, Inc.
7 # 7 #
8 # This library is free software; you can redistribute it and/or 8 # This library is free software; you can redistribute it and/or
9 # modify it under the terms of the GNU Lesser General Public 9 # modify it under the terms of the GNU Lesser General Public
10 # License as published by the Free Software Foundation; either 10 # License as published by the Free Software Foundation; either
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 ]) 105 ])
106 106
107 # check for gtk-doc 107 # check for gtk-doc
108 GTK_DOC_CHECK(1.9) 108 GTK_DOC_CHECK(1.9)
109 109
110 # check for dbus-glib 110 # check for dbus-glib
111 PKG_CHECK_MODULES(DBUS, [ 111 PKG_CHECK_MODULES(DBUS, [
112 dbus-1 112 dbus-1
113 ]) 113 ])
114 114
115 # check gconf 115 AC_ARG_ENABLE(gconf,
116 PKG_CHECK_MODULES(GCONF, 116 AS_HELP_STRING([--disable-gconf],
117 [gconf-2.0 >= 2.12], 117 [Do not use GConf code]),
118 [enable_gconf=$enableval],
119 [enable_gconf=yes]
118 ) 120 )
119 121
120 AC_PATH_PROG(GCONFTOOL, gconftool-2, no) 122 AM_CONDITIONAL([ENABLE_GCONF], [test "x$enable_gconf" = "xyes"])
121 if test x"$GCONFTOOL" = xno; then
122 AC_MSG_ERROR([gconftool-2 executable not found in your path - should be inst alled with GConf])
123 fi
124 123
125 AM_GCONF_SOURCE_2 124 if test x"$enable_gconf" != x"no"; then
125 # check gconf
126 PKG_CHECK_MODULES(GCONF,
127 [gconf-2.0 >= 2.12],
128 )
129
130 AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
131 if test x"$GCONFTOOL" = xno; then
132 AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
133 fi
134
135 AM_GCONF_SOURCE_2
126 136
127 # GCONF_SERVERDIR=`$PKG_CONFIG --variable=gconf_serverdir gconf-2.0` 137 # GCONF_SERVERDIR=`$PKG_CONFIG --variable=gconf_serverdir gconf-2.0`
128 # old_path=$PATH 138 # old_path=$PATH
129 # if test x"$GCONF_SERVERDIR" != x; then 139 # if test x"$GCONF_SERVERDIR" != x; then
130 # PATH=$GCONF_SERVERDIR:$PATH 140 # PATH=$GCONF_SERVERDIR:$PATH
131 # fi 141 # fi
132 # 142 #
133 # AC_PATH_PROG(GCONF_SANITY_CHECK, gconf-sanity-check-2, no) 143 # AC_PATH_PROG(GCONF_SANITY_CHECK, gconf-sanity-check-2, no)
134 # if test x"$GCONF_SANITY_CHECK" = xno; then 144 # if test x"$GCONF_SANITY_CHECK" = xno; then
135 # AC_MSG_ERROR([gconf-sanity-check-2 executable not found in your path - sho uld be installed with GConf]) 145 # AC_MSG_ERROR([gconf-sanity-check-2 executable not found in your path - sho uld be installed with GConf])
136 # fi 146 # fi
137 # 147 #
138 # AC_SUBST(GCONF_SANITY_CHECK) 148 # AC_SUBST(GCONF_SANITY_CHECK)
139 # PATH=$old_path 149 # PATH=$old_path
150 else
151 AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [0])
152 fi
140 153
141 # Check for x11 154 # Check for x11
142 PKG_CHECK_MODULES(X11, [ 155 PKG_CHECK_MODULES(X11, [
143 x11 156 x11
144 ]) 157 ])
145 158
146 AC_CHECK_HEADERS([X11/XKBlib.h]) 159 AC_CHECK_HEADERS([X11/XKBlib.h])
147 160
148 # check env 161 # check env
149 AC_PATH_PROG(ENV, env) 162 AC_PATH_PROG(ENV, env)
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 AC_MSG_WARN([can not find iso-codes. It is required.]) 251 AC_MSG_WARN([can not find iso-codes. It is required.])
239 fi 252 fi
240 fi 253 fi
241 254
242 # OUTPUT files 255 # OUTPUT files
243 AC_CONFIG_FILES([ po/Makefile.in 256 AC_CONFIG_FILES([ po/Makefile.in
244 Makefile 257 Makefile
245 ibus-1.0.pc 258 ibus-1.0.pc
246 ibus.spec 259 ibus.spec
247 xinput-ibus 260 xinput-ibus
248 gconf/Makefile 261 memconf/Makefile
249 gconf/gconf.xml.in 262 memconf/memconf.xml.in
250 client/Makefile 263 client/Makefile
251 client/gtk2/Makefile 264 client/gtk2/Makefile
252 client/x11/Makefile 265 client/x11/Makefile
253 src/Makefile 266 src/Makefile
254 src/ibusversion.h 267 src/ibusversion.h
255 bus/Makefile 268 bus/Makefile
256 util/Makefile 269 util/Makefile
257 util/IMdkit/Makefile 270 util/IMdkit/Makefile
258 data/Makefile 271 data/Makefile
259 data/icons/Makefile 272 data/icons/Makefile
(...skipping 11 matching lines...) Expand all
271 ibus/interface/Makefile 284 ibus/interface/Makefile
272 ui/Makefile 285 ui/Makefile
273 ui/gtk/Makefile 286 ui/gtk/Makefile
274 ui/gtk/ibus-ui-gtk 287 ui/gtk/ibus-ui-gtk
275 ui/gtk/gtkpanel.xml.in 288 ui/gtk/gtkpanel.xml.in
276 setup/Makefile 289 setup/Makefile
277 setup/ibus-setup 290 setup/ibus-setup
278 ]) 291 ])
279 fi 292 fi
280 293
294 if test x"$enable_gconf" != x"no"; then
295 AC_CONFIG_FILES([
296 gconf/Makefile
297 gconf/gconf.xml.in
298 ])
299 fi
300
281 AC_OUTPUT 301 AC_OUTPUT
282 AC_MSG_RESULT([ 302 AC_MSG_RESULT([
283 Build options: 303 Build options:
284 Version $VERSION 304 Version $VERSION
285 Install prefix $prefix 305 Install prefix $prefix
286 Build shared libs $enable_shared 306 Build shared libs $enable_shared
287 Build static libs $enable_static 307 Build static libs $enable_static
288 Gtk immodule dir $GTK_IM_MODULEDIR 308 Gtk immodule dir $GTK_IM_MODULEDIR
289 Build python modules $enable_python 309 Build python modules $enable_python
310 Build gconf modules $enable_gconf
290 Build document $enable_gtk_doc 311 Build document $enable_gtk_doc
291 ]) 312 ])
292 313
OLDNEW
« no previous file with comments | « README.chromium ('k') | memconf/Makefile.am » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698