src/moonshot-provisioning-common.vala \
src/moonshot-id.vala
-src_moonshot_VALAFLAGS = --pkg gdk-2.0 --pkg gtk+-2.0 --pkg gee-1.0 $(AM_VALAFLAGS)
+src_moonshot_VALAFLAGS = --pkg $(GTK_VERSION) --pkg $(GEE_VERSION) $(AM_VALAFLAGS)
src_moonshot_CPPFLAGS = $(moonshot_CFLAGS) $(AM_CPPFLAGS)
src_moonshot_LDADD = $(moonshot_LIBS)
src_moonshot_LDFLAGS = -g -O0 $(MOONSHOT_LOG_LIBS)
-src_moonshot_webp_VALAFLAGS = --vapidir=$(top_srcdir)/libmoonshot --pkg gtk+-2.0 --pkg gdk-2.0 --pkg libmoonshot $(AM_VALAFLAGS)
+src_moonshot_webp_VALAFLAGS = --vapidir=$(top_srcdir)/libmoonshot --pkg libmoonshot $(AM_VALAFLAGS)
src_moonshot_webp_CPPFLAGS = $(moonshot_CFLAGS) $(AM_CPPFLAGS)
src_moonshot_webp_LDADD = $(moonshot_LIBS) ${top_builddir}/libmoonshot/libmoonshot.la
src_moonshot_webp_LDFLAGS =
linux=no
SERVER_IPC_MODULE="msrpc-glib2-1.0"
CLIENT_IPC_MODULE="msrpc-mingw-1.0"
- PKG_CHECK_MODULES([GTK],
- [gtk+-2.0 >= 2.18],
- [GTK_VERSION="gtk+-2.0"]
- )
;;
*darwin*)
[gtk-mac-integration >= 1.0.1]
)
-# TODO: Move to GTK+-3
-# [gtk+-3.0 >= 2.0],
-# [GTK_VERSION="gtk+-3.0"]
- PKG_CHECK_MODULES([GTK],
- [gtk+-2.0 >= 2.18],
- [GTK_VERSION="gtk+-2.0"]
- )
-
;;
*)
macos=no
[SERVER_IPC_MODULE="gio-2.0"],
[SERVER_IPC_MODULE="dbus-glib-1"]
)
-# TODO: Move to GTK+-3
-# [gtk+-3.0 >= 2.0],
-# [GTK_VERSION="gtk+-3.0"]
- PKG_CHECK_MODULES([GTK],
- [gtk+-2.0 >= 2.18],
- [GTK_VERSION="gtk+-2.0"]
- )
;;
esac
+
+# For all platforms: Use Gtk+3.0 if available; else revert to Gtk+2.0
+PKG_CHECK_MODULES([GTK],
+ [gtk+-3.0 >= 3.1],
+ [GTK_VERSION="gtk+-3.0"],
+ [PKG_CHECK_MODULES([GTK],
+ [gtk+-2.0 >= 2.18],
+ [GTK_VERSION="gtk+-2.0"]
+ )]
+)
+AC_SUBST(GTK_VERSION)
+
+
+# For all platforms: Use gee-0.8 if available; else revert to gee-1.0
+# (yes, gee-0.8 is an upgrade from gee-1.0!)
+PKG_CHECK_MODULES([LIB_GEE],
+ [gee-0.8 >= 0.16],
+ [GEE_VERSION="gee-0.8"],
+ [PKG_CHECK_MODULES([LIB_GEE],
+ [gee-1.0 >= 0.5],
+ [GEE_VERSION="gee-1.0"]
+ )]
+)
+AC_SUBST(GEE_VERSION)
+
#enable the optional use of Log4Vala (Must have the package installed!)
AC_ARG_ENABLE([log4vala],
[ --enable-log4vala Enable use of log4vala for logging],
glib-2.0 >= 2.22
gobject-2.0 >= 2.22
$GTK_VERSION
- gee-1.0 >= 0.5
+ $GEE_VERSION
$SERVER_IPC_MODULE
$MAC
])