diff options
| author | Lennart Poettering <lennart@poettering.net> | 2010-06-10 01:02:58 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2010-06-10 01:02:58 +0200 |
| commit | 2383e9ef4771213cd6c453a7a6db0cd42abd8d53 (patch) | |
| tree | c2ea48d9454454898c5b24264f7501abdcc649a8 /configure.ac | |
| parent | d852fdb7ad2552333cb74f687d73554050243b76 (diff) | |
gtk: optionally build for both gtk2 and gtk3
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 51 |
1 files changed, 50 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 85c3bde..6a0025c 100644 --- a/configure.ac +++ b/configure.ac @@ -374,13 +374,54 @@ else HAVE_GTK=0 fi - AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS) AC_SUBST(GTK_MODULES_DIR) AC_SUBST(HAVE_GTK) AM_CONDITIONAL([HAVE_GTK], [test "x$HAVE_GTK" = x1]) +AC_ARG_ENABLE([gtk3], + AS_HELP_STRING([--disable-gtk3], [Disable optional GTK+ 3 support]), + [ + case "${enableval}" in + yes) gtk3=yes ;; + no) gtk3=no ;; + *) AC_MSG_ERROR(bad value ${enableval} for --disable-gtk3) ;; + esac + ], + [gtk3=auto]) + +AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [false]) +if test "x${gtk3}" != xno ; then + PKG_CHECK_MODULES(GTK3, [ gtk+-3.0 gthread-2.0 ], + [ + HAVE_GTK3=1 + AC_DEFINE([HAVE_GTK3], 1, [Have GTK3?]) + + AC_PATH_PROG(GCONFTOOL, gconftool-2) + AM_GCONF_SOURCE_2 + + GTK3_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0` + GTK3_MODULES_DIR="${libdir}/gtk-3.0/modules" + ], + [ + HAVE_GTK3=0 + if test "x$gtk3" = xyes ; then + AC_MSG_ERROR([*** GTK3 not found ***]) + fi + ]) +else + HAVE_GTK3=0 +fi + +AC_SUBST(GTK3_CFLAGS) +AC_SUBST(GTK3_LIBS) +AC_SUBST(GTK3_MODULES_DIR) +AC_SUBST(HAVE_GTK3) +AM_CONDITIONAL([HAVE_GTK3], [test "x$HAVE_GTK3" = x1]) + +AM_CONDITIONAL([HAVE_GTK_ANY], [test "x$HAVE_GTK" = x1 -o "x$HAVE_GTK3" = x1]) + #### TDB cache support (optional) #### AC_ARG_ENABLE([tdb], @@ -583,6 +624,7 @@ Makefile src/Makefile libcanberra.pc libcanberra-gtk.pc +libcanberra-gtk3.pc src/canberra.h gtkdoc/Makefile doc/Makefile @@ -646,6 +688,11 @@ if test "x$HAVE_GTK" = "x1" ; then ENABLE_GTK=yes fi +ENABLE_GTK3=no +if test "x$HAVE_GTK3" = "x1" ; then + ENABLE_GTK3=yes +fi + ENABLE_TDB=no if test "x$HAVE_TDB" = "x1" ; then ENABLE_TDB=yes @@ -681,6 +728,8 @@ echo " Enable lookup cache: ${ENABLE_CACHE} Enable GTK+: ${ENABLE_GTK} GTK Modules Directory: ${GTK_MODULES_DIR} + Enable GTK3+: ${ENABLE_GTK3} + GTK3 Modules Directory: ${GTK3_MODULES_DIR} " |