From: Fredrik Tolf Date: Mon, 14 Jan 2008 13:14:53 +0000 (+0100) Subject: Check specifically for GTK features. X-Git-Tag: 1.1~27 X-Git-Url: http://git.dolda2000.com/gitweb/?a=commitdiff_plain;h=31119a15bb2cd5f2013148341fc95b510fa7df15;p=doldaconnect.git Check specifically for GTK features. --- diff --git a/acinclude.m4 b/acinclude.m4 index 5589ce6..493f374 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -30,6 +30,22 @@ AC_CHECK_HEADER($1, $2, $3) CPPFLAGS="$cpp_bak" ]) +# DOLDA_CHECK_FUNC(FUNCTION, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND, +# [EXTRA-CFLAGS], [EXTRA-LDFLAGS]) +# +# Augmented version of AC_CHECK_HEADER that overrides CPPFLAGS and +# LDFLAGS + +AC_DEFUN([DOLDA_CHECK_FUNC],[dnl +cpp_bak="$CPPFLAGS" +ld_bak="$LDFLAGS" +ifelse([$4], , , [CPPFLAGS="$CPPFLAGS $4"]) +ifelse([$5], , , [LDFLAGS="$LDFLAGS $5"]) +AC_CHECK_FUNC($1, $2, $3) +CPPFLAGS="$cpp_bak" +LDFLAGS="$ldflags" +]) + # DOLDA_ENABLE(NAME, HELP, DEFAULT, DEPS) # # DEPS is a space-separated listing of required variables that must be diff --git a/configure.in b/configure.in index 548f9af..77b90d5 100644 --- a/configure.in +++ b/configure.in @@ -56,6 +56,10 @@ DOLDA_PKG([HAS_GTK2], [test "$with_gtk2" = no && HAS_GTK2=no], if test "$with_gtk2" = yes -a "$HAS_GTK2" = no; then AC_MSG_ERROR([*** cannot find GTK2 on this system]) fi +DOLDA_PKG([HAS_GTK2SI], [test "$HAS_GTK2" = no && HAS_GTK2SI=no], + [DOLDA_CHECK_FUNC(gtk_status_icon_new_from_pixbuf, [], [HAS_GTK2SI=no], $GTK2_CFLAGS, $GTK2_LIBS)]) +DOLDA_PKG([HAS_GTK2ASS], [test "$HAS_GTK2" = no && HAS_GTK2ASS=no], + [DOLDA_CHECK_FUNC(gtk_assistant_new, [], [HAS_GTK2ASS=no], $GTK2_CFLAGS, $GTK2_LIBS)]) # libxml2 check AC_ARG_WITH(libxml2, [ --with-libxml2 Enable libxml2 support]) @@ -100,12 +104,12 @@ AM_CONDITIONAL(CLI_GTK2, test "$enable_gtk2ui" = yes) # Dolconf check DOLDA_ENABLE(dolconf, [ --enable-dolconf Build the configuration helper], yes, - [HAS_GTK2]) + [HAS_GTK2], [HAS_GTK2ASS]) AM_CONDITIONAL(DOLCONF, test "$enable_dolconf" = yes) # GUI shell check DOLDA_ENABLE(guishell, [ --enable-guishell Build the GUI shell programs], yes, - [HAS_GTK2]) + [HAS_GTK2], [HAS_GTK2SI]) AM_CONDITIONAL(GUISHELL, test "$enable_guishell" = yes) # Gnome applet check