diff options
| author | Jon Lund Steffensen <jonlst@gmail.com> | 2011-07-04 14:14:44 +0200 |
|---|---|---|
| committer | Jon Lund Steffensen <jonlst@gmail.com> | 2011-07-04 14:14:44 +0200 |
| commit | adbcc89b3e93d0afcf0aee836d81424508f6edb5 (patch) | |
| tree | e0eae4539f3eb95ca0fabf953ff5ddfc988241cb | |
| parent | Apply fix for new clock applet gconf (Miloš Komarčević). (diff) | |
| download | redshift-ng-adbcc89b3e93d0afcf0aee836d81424508f6edb5.tar.gz redshift-ng-adbcc89b3e93d0afcf0aee836d81424508f6edb5.tar.bz2 redshift-ng-adbcc89b3e93d0afcf0aee836d81424508f6edb5.tar.xz | |
Install Ubuntu icons as option (--enable-ubuntu). (Francesco Marella)
| -rw-r--r-- | Makefile.am | 9 | ||||
| -rw-r--r-- | configure.ac | 12 |
2 files changed, 19 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 89055e3..0564869 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,6 +8,7 @@ hicolor_icon_DATA = data/icons/hicolor/scalable/apps/redshift.svg \ data/icons/hicolor/scalable/apps/redshift-status-on.svg \ data/icons/hicolor/scalable/apps/redshift-status-off.svg +if ENABLE_UBUNTU ubuntu_mono_dark_icondir = @datadir@/icons/ubuntu-mono-dark/scalable/apps ubuntu_mono_dark_icon_DATA = \ data/icons/ubuntu-mono-dark/scalable/apps/redshift-status-on.svg \ @@ -17,6 +18,7 @@ ubuntu_mono_light_icondir = @datadir@/icons/ubuntu-mono-light/scalable/apps ubuntu_mono_light_icon_DATA = \ data/icons/ubuntu-mono-light/scalable/apps/redshift-status-on.svg \ data/icons/ubuntu-mono-light/scalable/apps/redshift-status-off.svg +endif # Desktop file @@ -30,10 +32,13 @@ dist_man1_MANS = redshift.1 EXTRA_DIST = \ $(hicolor_icon_DATA) \ - $(ubuntu_mono_dark_icon_DATA) \ - $(ubuntu_mono_light_icon_DATA) \ $(desktop_DATA) +if ENABLE_UBUNTU +EXTRA_DIST += \ + $(ubuntu_mono_dark_icon_DATA) \ + $(ubuntu_mono_light_icon_DATA) +endif # Update PO translations .PHONY: update-po diff --git a/configure.ac b/configure.ac index 261c4ec..b6868e9 100644 --- a/configure.ac +++ b/configure.ac @@ -177,6 +177,17 @@ AS_IF([test "x$enable_gui" != xno], [ ]) AM_CONDITIONAL([ENABLE_GUI], [test "x$enable_gui" != xno]) +# Check for Ubuntu icons +AC_MSG_CHECKING([whether to enable Ubuntu icons]) +AC_ARG_ENABLE([ubuntu], [AC_HELP_STRING([--enable-ubuntu], + [enable Ubuntu icons])], + [enable_ubuntu=$enableval],[enable_ubuntu=no]) +AS_IF([test "x$enable_ubuntu" != xno], [ + AC_MSG_RESULT([yes]) +], [ + AC_MSG_RESULT([no]) +]) +AM_CONDITIONAL([ENABLE_UBUNTU], [test "x$enable_ubuntu" != xno]) # Checks for header files. AC_CHECK_HEADERS([locale.h stdint.h stdlib.h string.h unistd.h sys/signal.h]) @@ -216,4 +227,5 @@ echo " Geoclue: ${enable_geoclue} GUI: ${enable_gui} + Ubuntu icons: ${enable_ubuntu} " |