Support configure script --enable-pipes option to enable pipes (|) in filenames

diff --git a/ChangeLog b/ChangeLog
index 2cde40c7f4cf812c104160f77eb209cf432a5275..ca1e56201316c650ee43835813e94e4bcaad8238 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-05-31  7.0.1-8 Cristy  <quetzlzacatenango@image...>
+  * Support configure script --enable-pipes option to enable pipes (|) in
+    filenames.
+
 2016-05-30  7.0.1-7 Cristy  <quetzlzacatenango@image...>
   * Release ImageMagick version 7.0.1-7, GIT revision 18321:5511ef5:20160530.
 

diff --git a/MagickCore/blob.c b/MagickCore/blob.c
index c756a754e0213d243362442451374977963e9652..0bc5c8789c10380c8d80336a63c617e7267f66a5 100644 (file)
--- a/MagickCore/blob.c
+++ b/MagickCore/blob.c
@@ -2480,7 +2480,7 @@ MagickExport MagickBooleanType OpenBlob(const ImageInfo *image_info,
       image->blob->exempt=MagickTrue;
       return(SetStreamBuffering(image_info,image));
     }
-#if defined(MAGICKCORE_HAVE_POPEN)
+#if defined(MAGICKCORE_HAVE_POPEN) && defined(MAGICKCORE_PIPES_SUPPORT)
   if (*filename == '|')
     {
       char

diff --git a/configure b/configure
index a0058048ef8fb74e70eb227fe3896f40b9ea3c55..9b30547c63f01809aaf0e4e3c6a15e5e7d9068e0 100755 (executable)
--- a/configure
+++ b/configure
@@ -1167,6 +1167,7 @@ enable_installed
 enable_cipher
 enable_zero_configuration
 enable_hdri
+enable_pipes
 enable_assert
 enable_maintainer_mode
 enable_hugepages
@@ -1935,6 +1936,7 @@ Optional Features:
                           zero-configuration ImageMagick
   --enable-hdri           accurately represent the wide range of intensity
                           levels found in real scenes
+  --enable-pipes          enable pipes (|) in filenames
   --disable-assert        disable assert() statements in build
   --enable-maintainer-mode
                           enable make rules and dependencies not useful (and
@@ -4515,7 +4517,7 @@ MAGICK_PATCHLEVEL_VERSION=8
 
 MAGICK_VERSION=7.0.1-8
 
-MAGICK_GIT_REVISION=18324:8f2f50b:20160530
+MAGICK_GIT_REVISION=18325:28587c2:20160531
 
 
 # Substitute library versioning
@@ -23822,6 +23824,22 @@ MAGICK_PCFLAGS="$MAGICK_PCFLAGS -DMAGICKCORE_HDRI_ENABLE=$magick_hdri_enable"
 CFLAGS="$CFLAGS -DMAGICKCORE_HDRI_ENABLE=$magick_hdri_enable"
 CPPFLAGS="$CPPFLAGS -DMAGICKCORE_HDRI_ENABLE=$magick_hdri_enable"
 
+# Enable pipes (|) in filenames.
+# Check whether --enable-pipes was given.
+if test "${enable_pipes+set}" = set; then :
+  enableval=$enable_pipes; enable_pipes=$enableval
+else
+  enable_pipes='no'
+fi
+
+
+if test "$enable_pipes" = 'yes'; then
+
+$as_echo "#define PIPES_SUPPORT 1" >>confdefs.h
+
+    MAGICK_FEATURES="Pipes $MAGICK_FEATURES"
+fi
+
 # Build a version of ImageMagick with assert statements.
 # Check whether --enable-assert was given.
 if test "${enable_assert+set}" = set; then :

diff --git a/configure.ac b/configure.ac
index 671b66a199a5249e4d9580e60476d0077b382473..c86cc630cebeae45ba3e128e619b4caa1b9b3761 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -684,6 +684,18 @@ MAGICK_PCFLAGS="$MAGICK_PCFLAGS -DMAGICKCORE_HDRI_ENABLE=$magick_hdri_enable"
 CFLAGS="$CFLAGS -DMAGICKCORE_HDRI_ENABLE=$magick_hdri_enable"
 CPPFLAGS="$CPPFLAGS -DMAGICKCORE_HDRI_ENABLE=$magick_hdri_enable"
 
+# Enable pipes (|) in filenames.
+AC_ARG_ENABLE([pipes],
+    [AC_HELP_STRING([--enable-pipes],
+                    [enable pipes (|) in filenames])],
+    [enable_pipes=$enableval],
+    [enable_pipes='no'])
+
+if test "$enable_pipes" = 'yes'; then
+    AC_DEFINE(PIPES_SUPPORT,1,[enable pipes (|) in filenames])
+    MAGICK_FEATURES="Pipes $MAGICK_FEATURES"
+fi
+
 # Build a version of ImageMagick with assert statements.
 AC_ARG_ENABLE([assert],
     [AC_HELP_STRING([--disable-assert],