Merge branch...

Merge branch '32-versions-of-image-libraries-are-evaluated-by-hand-and-given-as-parameters-on-the-compiler-command-line' into 'master'

Resolve "versions of image libraries are evaluated by hand and given as parameters on the compiler command line"

Closes #32

See merge request !41

bob/io/image/include/bob.io.image/config.h

@@ -47,8 +47,8 @@
    */
 #ifdef HAVE_LIBJPEG
   static PyObject* libjpeg_version() {
-    boost::format f("%d (compiled with %d bits depth)");
-    f % LIBJPEG_VERSION % BITS_IN_JSAMPLE;
+    boost::format f("%d.%d (compiled with %d bits depth)");
+    f % JPEG_LIB_VERSION_MAJOR % JPEG_LIB_VERSION_MINOR % BITS_IN_JSAMPLE;
     return Py_BuildValue("s", f.str().c_str());
   }
 #endif
@@ -89,13 +89,9 @@
    */
 #ifdef HAVE_GIFLIB
   static PyObject* giflib_version() {
-  #ifdef GIFLIB_VERSION
-   return Py_BuildValue("s", GIFLIB_VERSION);
-  #else
     boost::format f("%s.%s.%s");
     f % BOOST_PP_STRINGIZE(GIFLIB_MAJOR) % BOOST_PP_STRINGIZE(GIFLIB_MINOR) % BOOST_PP_STRINGIZE(GIFLIB_RELEASE);
     return Py_BuildValue("s", f.str().c_str());
-  #endif
   }
 #endif
 

setup.py

@@ -127,7 +127,6 @@ class jpeg:
   def macros(self):
     return [
         ('HAVE_%s' % self.name.upper(), '1'),
-        ('%s_VERSION' % self.name.upper(), '"%s"' % self.version),
         ]
 
 def libtiff_version(header):
@@ -223,7 +222,6 @@ class tiff:
   def macros(self):
     return [
         ('HAVE_%s' % self.name.upper(), '1'),
-        ('%s_VERSION' % self.name.upper(), '"%s"' % self.version),
         ]
 
 def libgif_version(header):
@@ -325,7 +323,6 @@ class gif:
   def macros(self):
     return [
         ('HAVE_%s' % self.name.upper(), '1'),
-        ('%s_VERSION' % self.name.upper(), '"%s"' % self.version),
         ]
 
 jpeg_pkg = jpeg()