(no commit message)

diff --git a/Makefile.am b/Makefile.am
index 2253a7c3bea5e9a3ce6b432a73c3d0ea930c1d6d..f6f481019885104dbb71dc71edda3484502f8277 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -76,7 +76,7 @@ TESTS_ENVIRONMENT = \
   IDENTIFY="$(MEMCHECK) @abs_top_builddir@/utilities/identify" \
   MONTAGE="$(MEMCHECK) @abs_top_builddir@/utilities/montage" \
   VALIDATE="$(MEMCHECK) @abs_top_builddir@/tests/validate" \
-  REFERENCE_IMAGE="$(MEMCHECK) @abs_top_builddir@/images/rose.pnm" \
+  REFERENCE_IMAGE="@abs_top_builddir@/images/rose.pnm" \
        LD_LIBRARY_PATH="@abs_top_builddir@/magick/.libs:${LD_LIBRARY_PATH}" \
        MAGICK_CODER_MODULE_PATH='@MAGICK_CODER_MODULE_PATH@' \
        MAGICK_CONFIGURE_PATH='@MAGICK_CONFIGURE_BUILD_PATH@@DIRSEP@@MAGICK_CONFIGURE_SRC_PATH@' \

diff --git a/Makefile.in b/Makefile.in
index 1470658df276aae8da340282886e9ad5893fa915..ec32664f0fd587631a8eb9fc7d92fb2220e4f23e 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -2586,7 +2586,7 @@ TESTS_ENVIRONMENT = \
   IDENTIFY="$(MEMCHECK) @abs_top_builddir@/utilities/identify" \
   MONTAGE="$(MEMCHECK) @abs_top_builddir@/utilities/montage" \
   VALIDATE="$(MEMCHECK) @abs_top_builddir@/tests/validate" \
-  REFERENCE_IMAGE="$(MEMCHECK) @abs_top_builddir@/images/rose.pnm" \
+  REFERENCE_IMAGE="@abs_top_builddir@/images/rose.pnm" \
        LD_LIBRARY_PATH="@abs_top_builddir@/magick/.libs:${LD_LIBRARY_PATH}" \
        MAGICK_CODER_MODULE_PATH='@MAGICK_CODER_MODULE_PATH@' \
        MAGICK_CONFIGURE_PATH='@MAGICK_CONFIGURE_BUILD_PATH@@DIRSEP@@MAGICK_CONFIGURE_SRC_PATH@' \

diff --git a/config/configure.xml b/config/configure.xml
index 8c1471f6d3da64d1d76c7e73bdb35e0b8f1fb97f..4b182a6bae122d06f391854a6c3e6ab0752cb861 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -10,7 +10,7 @@
   <configure name="LIB_VERSION" value="0x660"/>
   <configure name="LIB_VERSION_NUMBER" value="6,6,0,1"/>
   <configure name="RELEASE_DATE" value="2010-03-03"/>
-  <configure name="CONFIGURE" value="./configure "/>
+  <configure name="CONFIGURE" value="./configure  '--enable-maintainer-mode'"/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>
   <configure name="VERSION" value="6.6.0"/>

diff --git a/tests/validate-pipe.sh b/tests/validate-pipe.sh
index 8959952e754c500048853e536979b7bb20b12d3e..414da4d8e1a2fec8a8e053bc623e9ebcce975bfd 100755 (executable)
--- a/tests/validate-pipe.sh
+++ b/tests/validate-pipe.sh
@@ -20,10 +20,10 @@ set -e # Exit on any error
 . ${srcdir}/tests/common.sh
 
 ${CONVERT} pnm:- 'null:' < ${REFERENCE_IMAGE}
-${CONVERT} pnm:- miff:-  < ${REFERENCE_IMAGE} | ${IDENTIFY} -format '%m %wx%h %r %q-bit' -
-${CONVERT} pnm:- -  < ${REFERENCE_IMAGE} | ${IDENTIFY} -format '%m %wx%h %r %q-bit' -
+${CONVERT} pnm:- miff:-  < ${REFERENCE_IMAGE} | ${IDENTIFY} -
+${CONVERT} pnm:- -  < ${REFERENCE_IMAGE} | ${IDENTIFY} -
 ${CONVERT} - 'null:' < ${REFERENCE_IMAGE}
-${CONVERT} - miff:-  < ${REFERENCE_IMAGE} | ${IDENTIFY} -format '%m %wx%h %r %q-bit' -
-${CONVERT} - -  < ${REFERENCE_IMAGE} | ${IDENTIFY} -format '%m %wx%h %r %q-bit' -
-${CONVERT} ${REFERENCE_IMAGE} - | ${IDENTIFY} -format '%m %wx%h %r %q-bit' -
-${CONVERT} ${REFERENCE_IMAGE} miff:- | ${IDENTIFY} -format '%m %wx%h %r %q-bit' -
+${CONVERT} - miff:-  < ${REFERENCE_IMAGE} | ${IDENTIFY} -
+${CONVERT} - -  < ${REFERENCE_IMAGE} | ${IDENTIFY} -
+${CONVERT} ${REFERENCE_IMAGE} - | ${IDENTIFY} -
+${CONVERT} ${REFERENCE_IMAGE} miff:- | ${IDENTIFY} -