diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 51 |
1 files changed, 16 insertions, 35 deletions
diff --git a/configure.ac b/configure.ac index 22dd3e9..05bf8cb 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.64]) -AC_INIT([redshift], [1.3], [https://bugs.launchpad.net/redshift]) +AC_INIT([redshift], [1.6], [https://bugs.launchpad.net/redshift]) AC_CONFIG_SRCDIR([src/redshift.c]) AC_CONFIG_HEADERS([config.h]) AM_INIT_AUTOMAKE([dist-bzip2]) @@ -22,7 +22,7 @@ PKG_CHECK_MODULES([XCB], [xcb], [have_xcb=yes], [have_xcb=no]) PKG_CHECK_MODULES([XCB_RANDR], [xcb-randr], [have_xcb_randr=yes], [have_xcb_randr=no]) -PKG_CHECK_MODULES([GLIB], [glib-2.0], [have_glib=yes], [have_glib=no]) +PKG_CHECK_MODULES([GLIB], [glib-2.0 gobject-2.0], [have_glib=yes], [have_glib=no]) PKG_CHECK_MODULES([GCONF], [gconf-2.0], [have_gconf=yes], [have_gconf=no]) AC_CHECK_HEADER([windows.h], [have_windows_h=yes], [have_windows_h=no]) @@ -131,44 +131,25 @@ AS_IF([test "x$enable_gnome_clock" != xno], [ ]) AM_CONDITIONAL([ENABLE_GNOME_CLOCK], [test "x$enable_gnome_clock" = xyes]) - -# Check for GUI -# There doesn't seem to be an easy way of detecting the presence -# of a python module. For that reason, statusicon is the default GUI. -AC_MSG_CHECKING([which GUI to enable]) +# Check for GUI status icon +AC_MSG_CHECKING([whether to enable GUI status icon]) AC_ARG_ENABLE([gui], [AC_HELP_STRING([--enable-gui], - [enable GUI (appindicator, statusicon or none)])], + [enable GUI status icon])], [enable_gui=$enableval],[enable_gui=maybe]) - -# Statusicon GUI -AS_IF([test "x$enable_gui" = xstatusicon -o "x$enable_gui" = maybe], [ - AS_IF([test $have_python != yes], [ - AS_IF([test "x$enable_gui" = xstatusicon], [ - AC_MSG_ERROR([status icon script requires Python 2.6]) - ]) - enable_gui=maybe - ]) -]) - -# Appindicator GUI -AS_IF([test "x$enable_gui" = xappindicator -o "x$enable_gui" = maybe], [ - AS_IF([test $have_python != yes], [ - AS_IF([test "x$enable_gui" = xappindicator], [ - AC_MSG_ERROR([application indicator script requires Python 2.6]) +AS_IF([test "x$enable_gui" != xno], [ + AS_IF([test $have_python = yes], [ + AC_MSG_RESULT([yes]) + ], [ + AC_MSG_RESULT([missing dependencies]) + AS_IF([test "x$enable_gui" = xyes], [ + AC_MSG_ERROR([GUI status icon script requires Python 2.6]) ]) - enable_gui=maybe + enable_gui=no ]) +], [ + AC_MSG_RESULT([no]) ]) - -# Fall back to no GUI -AS_IF([test "x$enable_gui" != xappindicator -a "x$enable_gui" != xstatusicon], [ - enable_gui=none -]) - -AC_MSG_RESULT([$enable_gui]) - -AM_CONDITIONAL([ENABLE_STATUSICON], [test "x$enable_gui" = xstatusicon]) -AM_CONDITIONAL([ENABLE_APPINDICATOR], [test "x$enable_gui" = xappindicator]) +AM_CONDITIONAL([ENABLE_GUI], [test "x$enable_gui" != xno]) # Checks for header files. |