libfsoframework: restructure autoconf/automake configuration to be ready for a release

1 files changed, 55 insertions, 15 deletions

diff --git a/libfsoframework/configure.ac b/libfsoframework/configure.ac
index a784ce4d..d15c0c83 100644
--- a/libfsoframework/configure.ac
+++ b/libfsoframework/configure.ac
@@ -1,32 +1,61 @@
-AC_INIT([libfsoframework], [0.10.0], [smartphones-userland@linuxtogo.org], [libfsoframework])
+m4_define([fsoframework_released], [0])
+m4_define([fsoframework_base_version], [0.10.0])
+m4_define([fsoframework_maybe_gitrev], m4_if(fsoframework_released, [1], [], [m4_esyscmd([git show-ref --hash=5 HEAD | tr -d '\n\r'])]))
+m4_define([fsoframework_version], m4_if(fsoframework_released, [1], [fsoframework_base_version], [fsoframework_base_version-fsoframework_maybe_gitrev]))
+
+AC_INIT([libfsoframework], fsoframework_version, [smartphones-userland@linuxtogo.org], [libfsoframework])
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
+AC_PREREQ([2.65])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS(config.h)
-AM_INIT_AUTOMAKE([dist-bzip2])
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip])
+AM_MAINTAINER_MODE([enable])
 
 AC_PROG_CC
 AM_PROG_CC_C_O
 AC_GNU_SOURCE
 AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
+PKG_PROG_PKG_CONFIG([0.21])
 
 AC_SUBST(CFLAGS)
 AC_SUBST(CPPFLAGS)
 AC_SUBST(LDFLAGS)
 
-# pkg-config requirements
-PKG_PROG_PKG_CONFIG
+#########################################################################################
+# Vala building options -- allows tarball builds without installing vala
+#########################################################################################
+
 VALA_REQUIRED=0.14.2
+
+AC_ARG_ENABLE([vala], AS_HELP_STRING([--enable-vala],[Enable building from Vala sources]),
+              [enable_vala=$enableval], [enable_vala=no])
+
+# Force Vala for non-release builds
+m4_if(fsosystem_released, [1], [],
+      [
+        enable_vala=yes
+        echo "Vala compiler required for non-release builds; requiring Vala..."
+      ])
+
+if test "x$enable_vala" = "xyes" ; then
+    AM_PROG_VALAC([$VALA_REQUIRED])
+    if test "x$VALAC" = "x" ; then
+        AC_MSG_ERROR([Vala requested but valac is not installed])
+    fi
+fi
+
+AM_CONDITIONAL([HAVE_VALA], [test "x$enable_vala" = "xyes"])
+
+#########################################################################################
+# Check for various dependencies
+#########################################################################################
+
 GLIB_REQUIRED=2.26.0
 GEE_REQUIRED=0.5.0
 FSO_REQUIRED=0.10.0
 
-# vala
-AC_PATH_PROG(VALAC, valac, valac)
-AC_SUBST(VALAC)
-m4_ifdef([AM_PROG_VALAC], [AM_PROG_VALAC([$VALA_REQUIRED])])
-
-# glib and friends
 PKG_CHECK_MODULES(GLIB,
   glib-2.0 >= $GLIB_REQUIRED
   gobject-2.0 >= $GLIB_REQUIRED
@@ -35,13 +64,15 @@ PKG_CHECK_MODULES(GLIB,
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
 
-# libfsobasics
 PKG_CHECK_MODULES(FSOBASICS,
   fsobasics-2.0 >= $FSO_REQUIRED)
 AC_SUBST(FSOBASICS_CFLAGS)
 AC_SUBST(FSOBASICS_LIBS)
 
+#########################################################################################
 # gather libdir
+#########################################################################################
+
 if test "x$prefix" != "xNONE"; then
   pkglibdir='${prefix}/lib/cornucopia'
 else
@@ -50,24 +81,29 @@ fi
 eval PACKAGE_LIBDIR="${pkglibdir}"
 AC_DEFINE_UNQUOTED([PACKAGE_LIBDIR], ["${PACKAGE_LIBDIR}"], [Module directory])
 
+#########################################################################################
 # check for debugging
+#########################################################################################
+
 AC_ARG_ENABLE(debug,
   [  --enable-debug            Enable debug build (default=disabled)],
   [debug=$enableval],
   [debug="no"])
 AM_CONDITIONAL( [WANT_DEBUG], [test x"$debug" = x"yes"])
 
+#########################################################################################
 # output
+#########################################################################################
+
 AC_CONFIG_FILES([
   Makefile
   fsoframework-2.0.pc
   fsoframework/Makefile])
-
 AC_OUTPUT
 
+#########################################################################################
 # info
-echo
-echo
+#########################################################################################
 echo
 echo "------------------------------------------------------------------------"
 echo "$PACKAGE_NAME $PACKAGE_VERSION"
@@ -75,6 +111,10 @@ echo "------------------------------------------------------------------------"
 echo
 echo "Configuration Options:"
 echo
+echo "  Vala....................: $enable_vala"
+echo
+echo "  Vala Compiler...........: ${VALAC}"
+echo
 echo "  modules directory.......: $pkglibdir"
 echo
 echo "  debug build.............: $debug"