From 5af4cefcd23dc068ceaa7a6db5406a590006695e Mon Sep 17 00:00:00 2001 From: Dan Breslau Date: Tue, 2 May 2017 20:03:48 -0400 Subject: [PATCH] Support Log4Vala 0.2 --- Makefile.am | 4 ++-- configure.ac | 15 ++++++++++++++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 0335016..11b5f48 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,8 +26,8 @@ AM_CPPFLAGS = \ if LOG4VALA -MOONSHOT_LOG_PKG= --pkg log4vala-0.1 -X -llog4vala-0.1 --define=USE_LOG4VALA -MOONSHOT_LOG_LIBS= -llog4vala-0.1 +MOONSHOT_LOG_PKG= --pkg $(LOG4VALA_VERSION) -X -l$(LOG4VALA_VERSION) --define=USE_LOG4VALA +MOONSHOT_LOG_LIBS= -l$(LOG4VALA_VERSION) else MOONSHOT_LOG_PKG= MOONSHOT_LOG_LIBS= diff --git a/configure.ac b/configure.ac index b71fac0..0b2cf22 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ([2.63]) AC_INIT([Moonshot-ui], - [1.0.0], + [1.0.3], [moonshot-community@jiscmail.ac.uk], [moonshot-ui], [http://www.project-moonshot.org/]) @@ -88,6 +88,19 @@ PKG_CHECK_MODULES([GTK], AC_SUBST(GTK_VERSION) +# For all platforms: Use Log4Vala 0.2 if available; else revert to 0.1 +PKG_CHECK_MODULES([LOG4VALA], + [log4vala-0.2], + [LOG4VALA_VERSION="log4vala-0.2"], + [PKG_CHECK_MODULES([LOG4VALA], + [log4vala-0.1], + [LOG4VALA_VERSION="log4vala-0.1"] + )] +) +AC_SUBST(LOG4VALA_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], -- 2.1.4