add config.vapi and GITV everywhere

12 files changed, 84 insertions, 5 deletions

diff --git a/fsodatad/configure.ac b/fsodatad/configure.ac
index fc88b492..5b3eea13 100644
--- a/fsodatad/configure.ac
+++ b/fsodatad/configure.ac
@@ -84,12 +84,16 @@ AC_SUBST(FSO_LIBS)
 PKG_CHECK_MODULES(FSO_GLIB,
   fso-glib-1.0 >= $FSO_GLIB_REQUIRED)
 
+# git version
+GITV=`cat ../.git/refs/heads/master || echo "unknown"`
+AC_DEFINE_UNQUOTED([PACKAGE_GITV], ["${GITV}"], [git version])
+
 # mobile broadband provider info database
 PKG_CHECK_MODULES(MBPI,
   mobile-broadband-provider-info >= $MBPI_REQUIRED)
 MBPI_DATABASE="`$PKG_CONFIG --variable=database mobile-broadband-provider-info`"
 if (test -z "{MPBI_DATABASE}"); then
-  AC_ERROR([Can't find mobile broadband provider info database file])
+  AC_ERROR([Can not find mobile broadband provider info database file])
 fi
 AC_SUBST(MBPI_DATABASE)
 AC_DEFINE_UNQUOTED([MBPI_DATABASE_PATH], ["${MBPI_DATABASE}"], [Path to xml service provider file])
@@ -118,3 +122,20 @@ AC_CONFIG_FILES([
 ])
 
 AC_OUTPUT
+#
+# Info
+#
+echo
+echo
+echo
+echo "------------------------------------------------------------------------"
+echo "$PACKAGE_NAME $PACKAGE_VERSION-$GITV"
+echo "------------------------------------------------------------------------"
+echo
+echo "Configuration Options:"
+echo
+echo "  prefix..................: $prefix"
+echo
+echo "------------------------------------------------------------------------"
+echo
+echo "Now type 'make' to compile and 'make install' to install this package."
diff --git a/fsodatad/vapi/config.vapi b/fsodatad/vapi/config.vapi
index f0277b01..f06761e2 100644
--- a/fsodatad/vapi/config.vapi
+++ b/fsodatad/vapi/config.vapi
@@ -2,6 +2,7 @@
 namespace Config
 {
     public const string PACKAGE_VERSION;
+    public const string PACKAGE_GITV;
     public const string PACKAGE_DATADIR;
     public const string MBPI_DATABASE_PATH;
 }
diff --git a/fsodeviced/configure.ac b/fsodeviced/configure.ac
index a1385ad7..a332134b 100644
--- a/fsodeviced/configure.ac
+++ b/fsodeviced/configure.ac
@@ -132,6 +132,10 @@ if test x$gstreamer = "xyes"; then
 fi
 AM_CONDITIONAL( [WANT_GSTREAMER], [test x"$gstreamer" = x"yes"])
 
+# git version
+GITV=`cat ../.git/refs/heads/master || echo "unknown"`
+AC_DEFINE_UNQUOTED([PACKAGE_GITV], ["${GITV}"], [git version])
+
 ##############################################################################
 # output
 AC_CONFIG_FILES([
@@ -179,7 +183,7 @@ echo
 echo
 echo
 echo "------------------------------------------------------------------------"
-echo "$PACKAGE_NAME $PACKAGE_VERSION"
+echo "$PACKAGE_NAME $PACKAGE_VERSION-$GITV"
 echo "------------------------------------------------------------------------"
 echo
 echo "Configuration Options:"
diff --git a/fsogsmd/vapi/config.vapi b/fsogsmd/vapi/config.vapi
index 5e7772f0..b8463bf0 100644
--- a/fsogsmd/vapi/config.vapi
+++ b/fsogsmd/vapi/config.vapi
@@ -2,6 +2,7 @@
 namespace Config
 {
     public const string PACKAGE_VERSION;
+    public const string PACKAGE_GITV;
     public const string PACKAGE_DATADIR;
     public const string PACKAGE_LIBDIR;
 }
diff --git a/fsomusicd/configure.ac b/fsomusicd/configure.ac
index 8afcc993..e1341d8b 100644
--- a/fsomusicd/configure.ac
+++ b/fsomusicd/configure.ac
@@ -9,7 +9,6 @@ AM_PROG_CC_C_O
 #AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
 
-
 AC_PATH_PROG(VALAC, valac, valac)
 AC_SUBST(VALAC)
 
@@ -55,6 +54,9 @@ if (test -z "{DBUS_SERVICE_DIR}"); then
 fi
 AC_SUBST(DBUS_SERVICE_DIR)
 
+# git version
+GITV=`cat ../.git/refs/heads/master || echo "unknown"`
+AC_DEFINE_UNQUOTED([PACKAGE_GITV], ["${GITV}"], [git version])
 
 AC_CONFIG_FILES([
 	Makefile
@@ -64,3 +66,18 @@ AC_CONFIG_FILES([
 	src/Makefile])
 
 AC_OUTPUT
+# info
+echo
+echo
+echo
+echo "------------------------------------------------------------------------"
+echo "$PACKAGE_NAME $PACKAGE_VERSION-$GITV"
+echo "------------------------------------------------------------------------"
+echo
+echo "Configuration Options:"
+echo
+echo "  prefix..................: $prefix"
+echo
+echo "------------------------------------------------------------------------"
+echo
+echo "Now type 'make' to compile and 'make install' to install this package."
diff --git a/fsonetworkd/vapi/config.vapi b/fsonetworkd/vapi/config.vapi
index 8ec2218f..4164fb70 100644
--- a/fsonetworkd/vapi/config.vapi
+++ b/fsonetworkd/vapi/config.vapi
@@ -2,6 +2,6 @@
 namespace Config
 {
     public const string PACKAGE_VERSION;
-    public const string PACKAGE_DATADIR;
     public const string PACKAGE_GITV;
+    public const string PACKAGE_DATADIR;
 }
diff --git a/fsotdld/configure.ac b/fsotdld/configure.ac
index 93ddca6c..dd53af4b 100644
--- a/fsotdld/configure.ac
+++ b/fsotdld/configure.ac
@@ -80,6 +80,10 @@ AC_SUBST(FSO_LIBS)
 PKG_CHECK_MODULES(FSO_GLIB,
   fso-glib-1.0 >= $FSO_GLIB_REQUIRED)
 
+# git version
+GITV=`cat ../.git/refs/heads/master || echo "unknown"`
+AC_DEFINE_UNQUOTED([PACKAGE_GITV], ["${GITV}"], [git version])
+
 AC_CONFIG_FILES([
   Makefile
   conf/Makefile
@@ -101,3 +105,18 @@ AC_CONFIG_FILES([
 ])
 
 AC_OUTPUT
+# info
+echo
+echo
+echo
+echo "------------------------------------------------------------------------"
+echo "$PACKAGE_NAME $PACKAGE_VERSION-$GITV"
+echo "------------------------------------------------------------------------"
+echo
+echo "Configuration Options:"
+echo
+echo "  prefix..................: $prefix"
+echo
+echo "------------------------------------------------------------------------"
+echo
+echo "Now type 'make' to compile and 'make install' to install this package."
diff --git a/fsousaged/vapi/config.vapi b/fsousaged/vapi/config.vapi
index 8ec2218f..4164fb70 100644
--- a/fsousaged/vapi/config.vapi
+++ b/fsousaged/vapi/config.vapi
@@ -2,6 +2,6 @@
 namespace Config
 {
     public const string PACKAGE_VERSION;
-    public const string PACKAGE_DATADIR;
     public const string PACKAGE_GITV;
+    public const string PACKAGE_DATADIR;
 }
diff --git a/libfsobasics/vapi/config.vapi b/libfsobasics/vapi/config.vapi
index cfd1d45b..edaccd55 100644
--- a/libfsobasics/vapi/config.vapi
+++ b/libfsobasics/vapi/config.vapi
@@ -2,5 +2,6 @@
 namespace Config
 {
     public const string PACKAGE_VERSION;
+    public const string PACKAGE_GITV;
     public const string PACKAGE_LIBDIR;
 }
diff --git a/libfsoframework/vapi/config.vapi b/libfsoframework/vapi/config.vapi
index cfd1d45b..edaccd55 100644
--- a/libfsoframework/vapi/config.vapi
+++ b/libfsoframework/vapi/config.vapi
@@ -2,5 +2,6 @@
 namespace Config
 {
     public const string PACKAGE_VERSION;
+    public const string PACKAGE_GITV;
     public const string PACKAGE_LIBDIR;
 }
diff --git a/libfsoresource/vapi/config.vapi b/libfsoresource/vapi/config.vapi
new file mode 100644
index 00000000..edaccd55
--- /dev/null
+++ b/libfsoresource/vapi/config.vapi
@@ -0,0 +1,7 @@
+[CCode (cprefix = "", lower_case_cprefix = "", cheader_filename = "config.h")]
+namespace Config
+{
+    public const string PACKAGE_VERSION;
+    public const string PACKAGE_GITV;
+    public const string PACKAGE_LIBDIR;
+}
diff --git a/libfsotransport/vapi/config.vapi b/libfsotransport/vapi/config.vapi
new file mode 100644
index 00000000..edaccd55
--- /dev/null
+++ b/libfsotransport/vapi/config.vapi
@@ -0,0 +1,7 @@
+[CCode (cprefix = "", lower_case_cprefix = "", cheader_filename = "config.h")]
+namespace Config
+{
+    public const string PACKAGE_VERSION;
+    public const string PACKAGE_GITV;
+    public const string PACKAGE_LIBDIR;
+}