diff options
| -rw-r--r-- | configure.ac | 24 | ||||
| -rw-r--r-- | src/gtk-redshift/Makefile.am | 24 | ||||
| -rw-r--r-- | src/gtk-redshift/gtk-redshift.in (renamed from src/gtk-redshift/gtk-redshift) | 4 | ||||
| -rw-r--r-- | src/gtk-redshift/statusicon.py | 2 |
4 files changed, 49 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 89cb47a..e667f64 100644 --- a/configure.ac +++ b/configure.ac @@ -121,6 +121,27 @@ AS_IF([test "x$enable_gnome_clock" != xno], [ ]) AM_CONDITIONAL([ENABLE_GNOME_CLOCK], [test "x$enable_gnome_clock" != xno]) +# Check for application indicator +AC_MSG_CHECKING([whether to enable application indicator]) +AC_ARG_ENABLE([appindicator], [AC_HELP_STRING([--enable-appindicator], + [enable application indicator])], + [enable_appindicator=$enableval],[enable_appindicator=no]) +AS_IF([test "x$enable_appindicator" != xno], [ + AS_IF([test $have_python = yes], [ + AC_MSG_RESULT([yes]) + enable_gtk=no + ], [ + AC_MSG_RESULT([missing dependencies]) + AS_IF([test "x$enable_appindicator" = xyes], [ + AC_MSG_ERROR([application indicator script requires Python 2.6]) + ]) + enable_appindicator=no + ]) +], [ + AC_MSG_RESULT([no]) +]) +AM_CONDITIONAL([ENABLE_APPINDICATOR], [test "x$enable_appindicator" != xno]) + # Check for GTK+ status icon AC_MSG_CHECKING([whether to enable GTK status icon]) AC_ARG_ENABLE([gtk], [AC_HELP_STRING([--enable-gtk], @@ -168,4 +189,7 @@ echo " compiler: ${CC} cflags: ${CFLAGS} ldflags: ${LDFLAGS} + + gtk status icon: ${enable_gtk} + application indicator: ${enable_appindicator} " diff --git a/src/gtk-redshift/Makefile.am b/src/gtk-redshift/Makefile.am index d0d8695..9c8479f 100644 --- a/src/gtk-redshift/Makefile.am +++ b/src/gtk-redshift/Makefile.am @@ -1,5 +1,6 @@ if ENABLE_GTK +module=statusicon gtk_redshift_PYTHON = \ __init__.py \ statusicon.py @@ -8,12 +9,31 @@ nodist_gtk_redshift_PYTHON = \ gtk_redshiftdir = $(pythondir)/gtk_redshift dist_bin_SCRIPTS = gtk-redshift -EXTRA_DIST = defs.py.in +EXTRA_DIST = gtk-redshift.in \ + defs.py.in endif -CLEANFILES = defs.py +if ENABLE_APPINDICATOR +module=rsappindicator +gtk_redshift_PYTHON = \ + __init__.py \ + rsappindicator.py +nodist_gtk_redshift_PYTHON = \ + defs.py +gtk_redshiftdir = $(pythondir)/gtk_redshift + +dist_bin_SCRIPTS = gtk-redshift +EXTRA_DIST = gtk-redshift.in \ + defs.py.in +endif + +CLEANFILES = defs.py \ + gtk-redshift # Local python definitions +gtk-redshift: gtk-redshift.in + sed -e "s|\@module\@|$(module)|g" $< > $@ + defs.py: defs.py.in sed -e "s|\@bindir\@|$(bindir)|g" \ -e "s|\@localedir\@|$(localedir)|g" $< > $@ diff --git a/src/gtk-redshift/gtk-redshift b/src/gtk-redshift/gtk-redshift.in index f62c6f1..18ee145 100644 --- a/src/gtk-redshift/gtk-redshift +++ b/src/gtk-redshift/gtk-redshift.in @@ -19,5 +19,5 @@ if __name__ == '__main__': - from gtk_redshift.statusicon import run_statusicon - run_statusicon() + from gtk_redshift.@module@ import run + run() diff --git a/src/gtk-redshift/statusicon.py b/src/gtk-redshift/statusicon.py index 9925c35..2295963 100644 --- a/src/gtk-redshift/statusicon.py +++ b/src/gtk-redshift/statusicon.py @@ -30,7 +30,7 @@ import gtk, glib import defs -def run_statusicon(): +def run(): # Internationalisation gettext.bindtextdomain('redshift', defs.LOCALEDIR) gettext.textdomain('redshift') |