From 3e903113d33c96ce5eb6306b3c3a6d6cb2dacb57 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Orsini Date: Sun, 6 Nov 2011 19:12:14 +0000 Subject: [PATCH] build system supports gtk3 --- NEWS | 6 ++ configure | 176 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 20 ++++++- 3 files changed, 199 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index ac39966..ef2264c 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,9 @@ +* v0.6.2.13 +** psensor/psensor-server: build system supports gtk3 +** psensor: fixed error about 'expose-event' (signal replaced by + 'draw') when compiled with gtk3. +** psensor: fixed typo in french translation file. + * v0.6.2.12 ** psensor: added -d option to enable debug log (written to $HOME/.psensor/log). ** psensor: log sensor values in debug mode. diff --git a/configure b/configure index 6dc2a63..5c1d5a0 100755 --- a/configure +++ b/configure @@ -7298,6 +7298,102 @@ fi # Checks GTK +GTK_LIBS= + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK" >&5 +$as_echo_n "checking for GTK... " >&6; } + +if test -n "$GTK_CFLAGS"; then + pkg_cv_GTK_CFLAGS="$GTK_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 \""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-3.0 ") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 " 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$GTK_LIBS"; then + pkg_cv_GTK_LIBS="$GTK_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 \""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-3.0 ") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 " 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-3.0 " 2>&1` + else + GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-3.0 " 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$GTK_PKG_ERRORS" >&5 + + as_fn_error $? "Package requirements (gtk+-3.0 ) were not met: + +$GTK_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables GTK_CFLAGS +and GTK_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables GTK_CFLAGS +and GTK_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details" "$LINENO" 5; } +else + GTK_CFLAGS=$pkg_cv_GTK_CFLAGS + GTK_LIBS=$pkg_cv_GTK_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +fi + + + +if test "$GTK_LIBS" == ""; then pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK" >&5 @@ -7391,6 +7487,7 @@ $as_echo "yes" >&6; } fi +fi # Check GCONF @@ -7580,6 +7677,84 @@ fi # Checks AppIndicator APPINDICATOR_LIBS= + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for APPINDICATOR" >&5 +$as_echo_n "checking for APPINDICATOR... " >&6; } + +if test -n "$APPINDICATOR_CFLAGS"; then + pkg_cv_APPINDICATOR_CFLAGS="$APPINDICATOR_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"appindicator3-0.1\""; } >&5 + ($PKG_CONFIG --exists --print-errors "appindicator3-0.1") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_APPINDICATOR_CFLAGS=`$PKG_CONFIG --cflags "appindicator3-0.1" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$APPINDICATOR_LIBS"; then + pkg_cv_APPINDICATOR_LIBS="$APPINDICATOR_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"appindicator3-0.1\""; } >&5 + ($PKG_CONFIG --exists --print-errors "appindicator3-0.1") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_APPINDICATOR_LIBS=`$PKG_CONFIG --libs "appindicator3-0.1" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + APPINDICATOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "appindicator3-0.1" 2>&1` + else + APPINDICATOR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "appindicator3-0.1" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$APPINDICATOR_PKG_ERRORS" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: AppIndicator 3-0.1 not present\"" >&5 +$as_echo "$as_me: WARNING: AppIndicator 3-0.1 not present\"" >&2;} +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: AppIndicator 3-0.1 not present\"" >&5 +$as_echo "$as_me: WARNING: AppIndicator 3-0.1 not present\"" >&2;} +else + APPINDICATOR_CFLAGS=$pkg_cv_APPINDICATOR_CFLAGS + APPINDICATOR_LIBS=$pkg_cv_APPINDICATOR_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +$as_echo "#define HAVE_APPINDICATOR 1" >>confdefs.h + +fi + +if test "$APPINDICATOR_LIBS" == ""; then + pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for APPINDICATOR" >&5 $as_echo_n "checking for APPINDICATOR... " >&6; } @@ -7658,6 +7833,7 @@ $as_echo "#define HAVE_APPINDICATOR_029 1" >>confdefs.h fi +fi if test "$APPINDICATOR_LIBS" == ""; then diff --git a/configure.ac b/configure.ac index 40675c3..8ca1cb3 100644 --- a/configure.ac +++ b/configure.ac @@ -52,11 +52,18 @@ PKG_CHECK_MODULES(XEXT, xext) AC_SUBST(XEXT_CFLAGS) AC_SUBST(XEXT_LIBS) -# Checks GTK -PKG_CHECK_MODULES(GTK, gtk+-2.0 ) +# Checks GTK +GTK_LIBS= +PKG_CHECK_MODULES(GTK, gtk+-3.0 ) AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS) +if test "$GTK_LIBS" == ""; then + PKG_CHECK_MODULES(GTK, gtk+-2.0 ) + AC_SUBST(GTK_CFLAGS) + AC_SUBST(GTK_LIBS) +fi + # Check GCONF PKG_CHECK_MODULES(GCONF, gconf-2.0) AC_SUBST(GCONF_CFLAGS) @@ -76,12 +83,19 @@ AC_SUBST(LIBNOTIFY_LIBS) # Checks AppIndicator APPINDICATOR_LIBS= -PKG_CHECK_MODULES(APPINDICATOR, + +PKG_CHECK_MODULES(APPINDICATOR, appindicator3-0.1, + [AC_DEFINE([HAVE_APPINDICATOR],[1],[Use AppIndicator3-0.1])], + [AC_MSG_WARN(AppIndicator 3-0.1 not present")]) + +if test "$APPINDICATOR_LIBS" == ""; then + PKG_CHECK_MODULES(APPINDICATOR, appindicator-0.1 <= 0.2.9 , [AC_DEFINE([HAVE_APPINDICATOR],[1],[Use AppIndicator 0.2.9]) AC_DEFINE([HAVE_APPINDICATOR_029],[1],[Use AppIndicator 0.2.9]) ], [AC_MSG_WARN(AppIndicator 0.2.9 not present")]) +fi if test "$APPINDICATOR_LIBS" == ""; then PKG_CHECK_MODULES(APPINDICATOR, -- 2.7.4