Ticket #970: configure.diff

configure

@@ -688 +688 @@
         echo "#define EXIF_SUPPORT 1" >> ./mythgallery/mythgallery/config.h
         echo "LIBS += -lexif" >> ./mythgallery/mythgallery/config.pro
 
-        if test x`which pkg-config 2>/dev/null` != x"" ; then
-            if `pkg-config --atleast-version 0.6.9 libexif` ; then
-                echo "#define NEW_LIB_EXIF 1" >> \
-                    ./mythgallery/mythgallery/config.h
-            fi
+        #Forcing command line options to take precedent for NEW_LIB_EXIF
+        if test x"$newexif" = x"yes" ; then
+                echo "#define NEW_LIB_EXIF 1" >> \
+                ./mythgallery/mythgallery/config.h
         else
-            if test x"$newexif" = x"yes" ; then
-                echo "#define NEW_LIB_EXIF 1" >> \
-                    ./mythgallery/mythgallery/config.h
-            else
-                echo
-                echo "Could not determine libexif version, if it is greater"
-                echo "than or equal to 0.6.9 you need to add"
-                echo "--enable-new-exif to the configure flags"
-                echo
-            fi
+                if test x`which pkg-config 2>/dev/null` != x"" ; then
+                        if `pkg-config --atleast-version 0.6.9 libexif` ; then
+                                echo "#define NEW_LIB_EXIF 1" >> \
+                                ./mythgallery/mythgallery/config.h
+                        fi
+                else
+                        echo
+                        echo "Could not determine libexif version, if it is greater"
+                        echo "than or equal to 0.6.9 you need to add"
+                        echo "--enable-new-exif to the configure flags"
+                        echo
+                fi
         fi
     fi