gucharmap r1976 - trunk
- From: chpe svn gnome org
- To: svn-commits-list gnome org
- Subject: gucharmap r1976 - trunk
- Date: Wed, 21 Jan 2009 12:41:26 +0000 (UTC)
Author: chpe
Date: Wed Jan 21 12:41:25 2009
New Revision: 1976
URL: http://svn.gnome.org/viewvc/gucharmap?rev=1976&view=rev
Log:
Rewrite gconf check to make it enabled by default; if you don't want it
you'll have to explicitly pass --disable-gconf.
Add gthread to GCONFPKGS, fixing the build on solaris. Bug #568509.
Modified:
trunk/configure.ac
Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Wed Jan 21 12:41:25 2009
@@ -88,16 +88,17 @@
AC_SUBST([GLIB_MKENUMS])
AC_ARG_ENABLE([gconf],
- [AS_HELP_STRING([--disable-gconf],
- [don't build with gconf support])])
-if test "x$enable_gconf" != "xno"; then
- GCONFPKGS="gconf-2.0"
- PKG_CHECK_MODULES(GCONF, gconf-2.0,
- have_gconf=yes, have_gconf=no)
+ [AS_HELP_STRING([--disable-gconf],[don't build with gconf support])],
+ [],[enable_gconf=yes])
+
+if test "$enable_gconf" = "yes"; then
+ GCONFPKGS="gconf-2.0 gthread-2.0"
+ PKG_CHECK_MODULES([GCONF],[$GCONFPKGS])
+
+ AC_DEFINE([HAVE_GCONF], [1], [Define if have gconf])
else
GCONFPKGS=
AC_MSG_NOTICE([GCONF support disabled with --disable-gconf])
- have_gconf=no
fi
AC_SUBST([GCONFPKGS])
@@ -113,10 +114,6 @@
AC_SUBST(GCONF_CFLAGS)
AC_SUBST(GCONF_LIBS)
-if test "x$have_gconf" = "xyes" ; then
- AC_DEFINE([HAVE_GCONF], [1], [Define if have gconf])
-fi
-
AH_TEMPLATE([ENABLE_UNIHAN], [Define if you want CJK ideograph information])
AC_ARG_ENABLE(unihan,
AC_HELP_STRING([--disable-unihan],
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]