diff options
| author | Eduard Roccatello <eduard@xfce.org> | 2015-08-19 19:43:47 +0200 |
|---|---|---|
| committer | Andre Miranda <andreldm@xfce.org> | 2017-07-16 14:41:23 -0300 |
| commit | 46b20c5c8e933041a93e33aa9ae2e08600818dfc (patch) | |
| tree | 5a94e00cf6310266dd1200d1423011ba7e37f510 /configure.ac.in | |
| parent | 4ccb7c70e6f7de5f880557e9675f00914365333f (diff) | |
| download | xfce4-appfinder-46b20c5c8e933041a93e33aa9ae2e08600818dfc.tar.gz | |
Ported a few things to GTK3. Taking care of deprecations right now.
Preferences crashes when debug is set to full (due to assertions).
Diffstat (limited to 'configure.ac.in')
| -rw-r--r-- | configure.ac.in | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/configure.ac.in b/configure.ac.in index 8f2b0c6..c9d254b 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -21,7 +21,7 @@ m4_define([appfinder_debug_default], [ifelse(xfce4_appfinder_version_tag(), [git dnl *************************** dnl *** Initialize autoconf *** dnl *************************** -AC_COPYRIGHT([Copyright (c) 2008-2011 The Xfce development team. All rights reserved.]) +AC_COPYRIGHT([Copyright (c) 2008-2015 The Xfce development team. All rights reserved.]) AC_INIT([xfce4-appfinder], [xfce4_appfinder_version], [http://bugzilla.xfce.org/], [xfce4-appfinder]) AC_REVISION([$Id$]) AC_PREREQ([2.60]) @@ -78,21 +78,12 @@ XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.10.0]) XDT_CHECK_PACKAGE([GARCON], [garcon-1], [0.3.0]) XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.10.0]) -dnl ************************************ -dnl *** Compile against GTK3 or GTK2 *** -dnl ************************************ -AC_ARG_ENABLE([gtk3], - [AC_HELP_STRING([--enable-gtk3], - [Compile against GTK+-3.0 (default=disabled)])], - [enable_gtk3=$enableval], [enable_gtk3=no]) -if test "x$enable_gtk3" = "xyes"; then - XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.10.0]) - XDT_CHECK_PACKAGE([GTK], [gtk+-3.0], [3.2.0]) -else - XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.10.0]) - XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.24.0]) -fi -AM_CONDITIONAL([ENABLE_GTK3], [test "x$enable_gtk3" = "xyes"]) +dnl **************************** +dnl *** Compile against GTK3 *** +dnl **************************** +XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.10.0]) +XDT_CHECK_PACKAGE([GTK], [gtk+-3.0], [3.14.0]) +AM_CONDITIONAL([ENABLE_GTK3], 1) dnl *********************************** dnl *** Check for debugging support *** @@ -130,11 +121,7 @@ dnl *************************** echo echo "Build Configuration:" echo -if test x"$enable_gtk3" = x"yes"; then echo " * Toolkit: GTK+-3" -else -echo " * Toolkit: GTK+-2" -fi echo " * Debugging Support: $enable_debug" echo |