[sword-svn] r2952 - trunk

[scribe at crosswire.org]

Author: scribe
Date: 2013-08-05 19:06:29 -0700 (Mon, 05 Aug 2013)
New Revision: 2952

Modified:
   trunk/configure.ac
   trunk/sword.pc.in
Log:
added numversion to pkg-config 


Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2013-08-05 18:19:23 UTC (rev 2951)
+++ trunk/configure.ac	2013-08-06 02:06:29 UTC (rev 2952)
@@ -295,7 +295,22 @@
   dir_confdef="yes"
 fi
 
+changequote(<<,>>)
+V1=`expr $VERSION : '\([0-9]*\)\.[0-9]*\.*[0-9]*[a-zA-Z]*[0-9]*'`
+V2=`expr $VERSION : '[0-9]*\.\([0-9]*\)\.*[0-9]*[a-zA-Z]*[0-9]*'`
+V3=`expr $VERSION : '[0-9]*\.[0-9]*\.*\([0-9]*\)[a-zA-Z]*[0-9]*'`
+V4=`expr $VERSION : '[0-9]*\.[0-9]*\.*[0-9]*\([a-zA-Z]*\)[0-9]*'`
+V5=`expr $VERSION : '[0-9]*\.[0-9]*\.*[0-9]*[a-zA-Z]*\([0-9]*\)'`
+changequote([,])
 
+if test "$V2" -le 9 ; then V2=0$V2 ; fi
+if test "$V3" -le 9 ; then V3=00$V3 ; elif test "$V3" -le 99 ; then V3=0$V3 ; fi
+
+SWORD_NUMVERSION=$V1$V2$V3
+AC_SUBST(SWORD_NUMVERSION)
+
+
+
 # ---------------------------------------------------------------------
 # Substitute variables into makefiles
 # ---------------------------------------------------------------------

Modified: trunk/sword.pc.in
===================================================================
--- trunk/sword.pc.in	2013-08-05 18:19:23 UTC (rev 2951)
+++ trunk/sword.pc.in	2013-08-06 02:06:29 UTC (rev 2952)
@@ -10,5 +10,5 @@
 @SHAREDLIB_TRUE at Libs: -L${libdir} -lsword
 @SHAREDLIB_FALSE at Libs: -L${libdir} -lsword -lz @CURL_LIBS@ @CLUCENE_LIBS@ @ICU_LIBS@ @ICU_IOLIBS@
 Libs.private: -L${libdir} -lsword -lz @CURL_LIBS@ @CLUCENE_LIBS@ @ICU_LIBS@ @ICU_IOLIBS@
-Cflags: -I${includedir}/sword
+Cflags: -I${includedir}/sword -DSWORD_NUMVERSION=@SWORD_NUMVERSION@