diff options
| author | Dan Nicholson <dbn.lists@gmail.com> | 2012-08-08 17:23:25 -0700 |
|---|---|---|
| committer | Dan Nicholson <dbn.lists@gmail.com> | 2012-08-08 17:23:25 -0700 |
| commit | bae5cd656500ce57d591d2957c8f2dffa387f978 (patch) | |
| tree | 8f6d6f26a615791a2d5d66ae8c8a149518ceac17 | |
| parent | 2c5daf59dd359f684736811b95c70d523b06b06b (diff) | |
Enable gtk3 when epiphany is installed
If Epiphany is installed it's likely people would want to use the plugin
with it. Turn on the gtk3 build in that case. This can still be
configured explicitly with --enable/disable-gtk3.
| -rw-r--r-- | configure.ac | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 56de4f0..b5ce4a6 100644 --- a/configure.ac +++ b/configure.ac @@ -26,8 +26,9 @@ PKG_CHECK_MODULES([MOZILLA], [$mozilla_pkgs]) dnl See if we want gtk2/evince2 and/or gtk3/evince3. This is important dnl because mozilla currently only support gtk2 plugins and epiphany -dnl only supports gtk3 plugins. Default to gtk2 for now since firefox is -dnl the more likely browser. +dnl only supports gtk3 plugins. Default gtk2 to yes for now since firefox +dnl is the more likely browser. However, if epiphany is installed, also +dnl enable gtk3. AC_MSG_CHECKING([if gtk+-2.0 should be used]) AC_ARG_ENABLE([gtk2], [AC_HELP_STRING([--enable-gtk2], @@ -38,15 +39,17 @@ AC_ARG_ENABLE([gtk2], esac], [enable_gtk2=yes]) AC_MSG_RESULT([$enable_gtk2]) +AC_CHECK_PROG([have_epiphany], [epiphany], [yes], [no]) AC_MSG_CHECKING([if gtk+-3.0 should be used]) AC_ARG_ENABLE([gtk3], [AC_HELP_STRING([--enable-gtk3], - [use gtk+/evince version 3 (default: no)])], + [use gtk+/evince version 3 ]dnl + [(default: yes if epiphany installed)])], [case "$enable_gtk3" in yes|no) ;; *) AC_MSG_ERROR([invalid option "$enable_gtk3"]) ;; esac], - [enable_gtk3=no]) + [enable_gtk3=$have_epiphany]) AC_MSG_RESULT([$enable_gtk3]) dnl Make sure we have one available toolkit |