Add LIBJPEG_TURBO_VERSION macro for checking the libjpeg-turbo version at compile...

git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@731 632fc199-4ca6-4c93-a231-07263d6284db

diff --git a/ChangeLog.txt b/ChangeLog.txt
index be091dd82af0152a81bfa6a2d97af132e1ecf9f9..07761058c2261980e0d5fbaa7632d4f967f0bd76 100644 (file)
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -11,6 +11,9 @@ This was more of an annoyance than an actual bug, since it did not cause any
 actual run-time problems, but the issue showed up when running libjpeg-turbo in
 valgrind.  See http://crbug.com/72399 for more information.
 
+[3] Added a compile-time macro (LIBJPEG_TURBO_VERSION) that can be used to
+check the version of libjpeg-turbo against which an application was compiled.
+
 
 1.1.90 (1.2 beta1)
 ==================

diff --git a/configure.ac b/configure.ac
index bb1c68ba74e95de3c6013b88f0b225342e478744..440f454ec071c2bbb21f888a30be8e8fbcf3d1c9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -140,6 +140,8 @@ AC_MSG_RESULT([$SO_MAJOR_VERSION:$SO_MINOR_VERSION])
 AC_SUBST(SO_MAJOR_VERSION)
 AC_SUBST(SO_MINOR_VERSION)
 
+AC_DEFINE_UNQUOTED(LIBJPEG_TURBO_VERSION, [$VERSION], [libjpeg-turbo version])
+
 VERSION_SCRIPT=yes
 AC_ARG_ENABLE([ld-version-script],
   AS_HELP_STRING([--disable-ld-version-script],

diff --git a/jconfig.h.in b/jconfig.h.in
index 4aef763249f6ca27342b3dbe1df50a553c6f38ba..e0d9dc8d76d2930819b28e41896cabdc1a9e7b4a 100644 (file)
--- a/jconfig.h.in
+++ b/jconfig.h.in
@@ -3,6 +3,9 @@
  */
 #define JPEG_LIB_VERSION  62   /* Version 6b */
 
+/* libjpeg-turbo version */
+#define LIBJPEG_TURBO_VERSION 0
+
 /* Support arithmetic encoding */
 #undef C_ARITH_CODING_SUPPORTED
 

diff --git a/win/jconfig.h.in b/win/jconfig.h.in
index 373976d88e2ccd15a22dea7084140fe7ec190946..382e5766c3c21c20437c976a3a255d9dd4019073 100644 (file)
--- a/win/jconfig.h.in
+++ b/win/jconfig.h.in
@@ -2,6 +2,7 @@
 /* see jconfig.txt for explanations */
 
 #define JPEG_LIB_VERSION @JPEG_LIB_VERSION@
+#define LIBJPEG_TURBO_VERSION @VERSION@
 #cmakedefine C_ARITH_CODING_SUPPORTED
 #cmakedefine D_ARITH_CODING_SUPPORTED