From: DRC <dcommander@users.sourceforge.net>
Date: Sun, 18 Dec 2011 16:29:35 +0000 (+0000)
Subject: Add LIBJPEG_TURBO_VERSION macro for checking the libjpeg-turbo version at compile... 
X-Git-Tag: 1.2.0~31
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ab64b62c6bc3e2d67834221017a574f90ca86c50;p=libjpeg-turbo

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


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 be091dd..0776105 100644
--- 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 bb1c68b..440f454 100644
--- 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 4aef763..e0d9dc8 100644
--- 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 373976d..382e576 100644
--- 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