summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configure.ac17
-rw-r--r--slack-required48
2 files changed, 38 insertions, 27 deletions
diff --git a/configure.ac b/configure.ac
index a6849eb..36b57d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,17 +52,22 @@ AC_SUBST(GLIB_CFLAGS)
AC_SUBST(GLIB_LIBS)
gtk2_modules="gtk+-2.0 >= 2.24.0"
gtk3_modules="gtk+-3.0 >= 3.4.0"
-AM_CONDITIONAL(GTK3, false)
-AM_CONDITIONAL(GTK2, true)
+AM_CONDITIONAL(GTK3, true)
+AM_CONDITIONAL(GTK2, false)
AC_ARG_ENABLE(gtk3,
[ --enable-gtk3 Build with GTK3 support],
- [enable_gtk3=$enableval], [enable_gtk3=no])
-if test x"$enable_gtk3" = x"yes"; then
+ [enable_gtk3=$enableval], [enable_gtk3=yes])
+AC_ARG_ENABLE(gtk2,
+ [ --enable-gtk2 Build with GTK2 support],
+ [enable_gtk2=$enableval], [enable_gtk2=no])
+if test x"$enable_gtk2" = x"yes"; then
+ PKG_CHECK_MODULES(GTK, [$gtk2_modules])
+ AM_CONDITIONAL(GTK3, false)
+ AM_CONDITIONAL(GTK2, true)
+else
PKG_CHECK_MODULES(GTK, [$gtk3_modules])
AM_CONDITIONAL(GTK3, true)
AM_CONDITIONAL(GTK2, false)
-else
- PKG_CHECK_MODULES(GTK, [$gtk2_modules])
fi
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
diff --git a/slack-required b/slack-required
index e4f0ce3..a9adab2 100644
--- a/slack-required
+++ b/slack-required
@@ -1,10 +1,26 @@
+aaa_elflibs|curl
+aaa_elflibs|libpng
+aaa_elflibs|libssh2
+aaa_elflibs|openldap-client
+aaa_elflibs|pcre
+aaa_elflibs|zlib
+at-spi2-atk
+at-spi2-core
atk
+bzip2
cairo
+cyrus-sasl
+dbus
+expat
fontconfig
freetype
-glib2
-gtk+2
+fribidi
gdk-pixbuf2
+glib2
+gpgme
+graphite2
+gtk+3
+harfbuzz
libX11
libXau
libXcomposite
@@ -17,26 +33,16 @@ libXi
libXinerama
libXrandr
libXrender
-libidn
-libpng
+libassuan
+libepoxy
+libffi
+libglvnd
+libgpg-error
+libpsl
+libunistring
libxcb
-openssl-solibs | openssl
+nghttp2
+openssl|openssl-solibs
pango
pixman
slapt-get
-zlib
-libffi
-harfbuzz
-icu4c
-bzip2
-curl
-cyrus-sasl
-expat
-gpgme
-libXxf86vm
-libassuan
-libdrm
-libgpg-error
-libxshmfence
-mesa
-openldap-client