Only compile video source code if it is enabled.

config/config.mk.in

@@ -120,6 +120,10 @@ EXPAT_LDFLAGS = @EXPAT_LDFLAGS@
 EXPAT_CPPFLAGS = @EXPAT_CPPFLAGS@
 EXPAT_LIBS = @EXPAT_LIBS@
 
+# **********************************************************************
+# Video support
+ENABLE_VIDEO = @ENABLE_VIDEO@
+
 # **********************************************************************
 # Libraries, include files, functions
 HAVE_LIBZ = @HAVE_LIBZ@

config/configure.ac

@@ -153,13 +153,15 @@ AC_MSG_RESULT($USE_XMP_TOOLKIT)
 
 AC_MSG_CHECKING([whether to compile with video support])
 AC_ARG_ENABLE(video,
-    [  --enable-video          compile with the ENABLE_VIDEO set ],
+    [  --enable-video          compile with video support ],
-    ENABLE_VIDEO=$enableval, ENABLE_VIDEO=no)
+    USE_VIDEO=$enableval, USE_VIDEO=no)
-AC_MSG_RESULT($ENABLE_VIDEO)
+AC_MSG_RESULT($USE_VIDEO)
-AC_SUBST(ENABLE_VIDEO)
+ENABLE_VIDEO=
-if test "$enable_video" = "yes"; then
+if test "$USE_VIDEO" = "yes"; then
+    ENABLE_VIDEO=1
     AC_DEFINE(ENABLE_VIDEO)
 fi
+AC_SUBST(ENABLE_VIDEO,$ENABLE_VIDEO)
 
 AC_MSG_CHECKING([whether to compile with webready support])
 AC_ARG_ENABLE(webready,
@@ -380,8 +382,8 @@ yes) echo "-- XMP metadata support........... YES" ;;
      echo "" ;;
 esac
 
-case "$ENABLE_VIDEO" in
+case "x$ENABLE_VIDEO" in
-yes) echo "-- Video support.................. YES" ;;
+x1)  echo "-- Video support.................. YES" ;;
 *)   echo "-- Video support.................. NO"
 esac
 

src/Makefile

@@ -66,8 +66,7 @@ CCHDR =  exiv2.hpp         \
          version.hpp
 
 # Add library C++ source files to this list
-CCSRC =  asfvideo.cpp          \
+CCSRC =  basicio.cpp           \
-	 basicio.cpp           \
 	 bmpimage.cpp          \
 	 canonmn.cpp           \
 	 casiomn.cpp           \
@@ -88,7 +87,6 @@ CCSRC =  asfvideo.cpp          \
 	 jp2image.cpp          \
 	 jpgimage.cpp          \
 	 makernote.cpp         \
-	 matroskavideo.cpp     \
 	 metadatum.cpp         \
 	 minoltamn.cpp         \
 	 mrwimage.cpp          \
@@ -105,9 +103,7 @@ endif
 CCSRC += preview.cpp           \
 	 properties.cpp        \
 	 psdimage.cpp          \
-	 quicktimevideo.cpp    \
 	 rafimage.cpp          \
-	 riffvideo.cpp         \
 	 rw2image.cpp          \
 	 samsungmn.cpp         \
 	 ssh.cpp               \
@@ -119,11 +115,17 @@ CCSRC += preview.cpp           \
 	 tiffimage.cpp         \
 	 tiffvisitor.cpp       \
 	 types.cpp             \
-	 utilsvideo.cpp        \
 	 value.cpp             \
 	 version.cpp           \
 	 xmp.cpp               \
 	 xmpsidecar.cpp
+ifdef ENABLE_VIDEO
+CCSRC += asfvideo.cpp          \
+	 matroskavideo.cpp     \
+	 quicktimevideo.cpp    \
+	 riffvideo.cpp         \
+	 utilsvideo.cpp
+endif
 
 # Add library C source files to this list
 ifndef HAVE_TIMEGM

src/asfvideo.cpp

@@ -32,12 +32,8 @@ EXIV2_RCSID("@(#) $Id$")
 // *****************************************************************************
 // included header files
 #include "config.h"
-#ifndef    EXV_ENABLE_VIDEO
+
-namespace  Exiv2 {
+#ifdef EXV_ENABLE_VIDEO
-extern int asfvideo_extern;
-int        asfvideo_extern = 1;
-}
-#else
 #include "asfvideo.hpp"
 #include "futils.hpp"
 #include "basicio.hpp"

src/matroskavideo.cpp

@@ -33,12 +33,7 @@ EXIV2_RCSID("@(#) $Id$")
 // included header files
 #include "config.h"
 
-#ifndef    EXV_ENABLE_VIDEO
+#ifdef EXV_ENABLE_VIDEO
-namespace  Exiv2 {
-extern int matroskavideo_extern;
-int        matroskavideo_extern=1;
-}
-#else
 #include "matroskavideo.hpp"
 #include "futils.hpp"
 #include "basicio.hpp"

src/quicktimevideo.cpp

@@ -33,12 +33,7 @@ EXIV2_RCSID("@(#) $Id$")
 // included header files
 #include "config.h"
 
-#ifndef    EXV_ENABLE_VIDEO
+#ifdef EXV_ENABLE_VIDEO
-namespace  Exiv2 {
-extern int quicktimevideo_extern ;
-int        quicktimevideo_extern = 1;
-}
-#else
 #include "quicktimevideo.hpp"
 #include "futils.hpp"
 #include "basicio.hpp"

src/riffvideo.cpp

@@ -33,12 +33,7 @@ EXIV2_RCSID("@(#) $Id$")
 // included header files
 #include "config.h"
 
-#ifndef     EXV_ENABLE_VIDEO
+#ifdef EXV_ENABLE_VIDEO
-namespace   Exiv2 {
-extern int  riffvideo_extern ;
-int         riffvideo_extern = 1;
-}
-#else
 #include "riffvideo.hpp"
 #include "futils.hpp"
 #include "basicio.hpp"

src/utilsvideo.cpp

@@ -28,7 +28,7 @@
  */
 // *****************************************************************************
 #include "rcsid_int.hpp"
-EXIV2_RCSID("@(#) $Id: utilsvideo.cpp 3777 2015-05-02 11:55:40Z ahuggel $")
+EXIV2_RCSID("@(#) $Id$")
 
 #ifdef EXV_ENABLE_VIDEO
 #include "utilsvideo.hpp"