From: cristy Date: Thu, 11 Nov 2010 13:51:21 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~8525 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=549177c2698132226e053f96e6b742a6d4e23c56;p=imagemagick --- diff --git a/ImageMagick.spec b/ImageMagick.spec index 94b909ac4..df6b22a1f 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -1,5 +1,5 @@ %global VERSION 6.6.5 -%global Patchlevel 9 +%global Patchlevel 8 Name: ImageMagick Version: %{VERSION} diff --git a/Magick++/bin/Magick++-config b/Magick++/bin/Magick++-config index f12e86eae..cca65e9df 100755 --- a/Magick++/bin/Magick++-config +++ b/Magick++/bin/Magick++-config @@ -23,7 +23,7 @@ fi while test $# -gt 0; do case "$1" in - -*=*) optarg=`echo -n "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; + -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; *) optarg= ;; esac case $1 in @@ -31,31 +31,31 @@ while test $# -gt 0; do prefix=$optarg ;; --prefix) - echo -n $prefix + echo $prefix ;; --exec-prefix=*) exec_prefix=$optarg ;; --exec-prefix) - echo -n $exec_prefix + echo $exec_prefix ;; --version) - echo -n '6.6.5 Q16 ' + echo '6.6.5 Q16 ' ;; --cflags) - echo -n "-I${includedir} -fopenmp" + echo "-I${includedir} -fopenmp" ;; --cxxflags) - echo -n '-g -O2 -pthread' + echo '-g -O2 -pthread' ;; --cppflags) - echo -n '-I/usr/local/include/ImageMagick' + echo '-I/usr/local/include/ImageMagick' ;; --ldflags) - echo -n '-L/usr/local/lib ' + echo '-L/usr/local/lib ' ;; --libs) - echo -n "-L${libdir} -lMagick++ -lMagickWand -lMagickCore -ltiff -lfreetype -ljasper -ljpeg -lpng -lfontconfig -lXext -lXt -lSM -lICE -lX11 -lbz2 -lxml2 -lz -lm -lgomp -lpthread -lltdl" + echo "-L${libdir} -lMagick++ -lMagickWand -lMagickCore -ltiff -lfreetype -ljasper -ljpeg -lpng -lfontconfig -lXext -lXt -lSM -lICE -lX11 -lbz2 -lxml2 -lz -lm -lgomp -lpthread -lltdl" ;; *) echo "${usage}" 1>&2 diff --git a/Magick++/bin/Magick++-config.in b/Magick++/bin/Magick++-config.in index 128c67eeb..06c6c381f 100755 --- a/Magick++/bin/Magick++-config.in +++ b/Magick++/bin/Magick++-config.in @@ -23,7 +23,7 @@ fi while test $# -gt 0; do case "$1" in - -*=*) optarg=`echo -n "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; + -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; *) optarg= ;; esac case $1 in @@ -31,31 +31,31 @@ while test $# -gt 0; do prefix=$optarg ;; --prefix) - echo -n $prefix + echo $prefix ;; --exec-prefix=*) exec_prefix=$optarg ;; --exec-prefix) - echo -n $exec_prefix + echo $exec_prefix ;; --version) - echo -n '@PACKAGE_VERSION@ Q@QUANTUM_DEPTH@ @MAGICK_HDRI@' + echo '@PACKAGE_VERSION@ Q@QUANTUM_DEPTH@ @MAGICK_HDRI@' ;; --cflags) - echo -n "-I${includedir} @MAGICK_PCFLAGS@" + echo "-I${includedir} @MAGICK_PCFLAGS@" ;; --cxxflags) - echo -n '@MAGICK_CXXFLAGS@' + echo '@MAGICK_CXXFLAGS@' ;; --cppflags) - echo -n '@MAGICK_CPPFLAGS@' + echo '@MAGICK_CPPFLAGS@' ;; --ldflags) - echo -n '@MAGICK_LDFLAGS@' + echo '@MAGICK_LDFLAGS@' ;; --libs) - echo -n "-L${libdir} -lMagick++ -lMagickWand @MAGICK_LIBS@" + echo "-L${libdir} -lMagick++ -lMagickWand @MAGICK_LIBS@" ;; *) echo "${usage}" 1>&2 diff --git a/config/configure.xml b/config/configure.xml index 7de177572..0d1fb85df 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -8,8 +8,8 @@ - - + + diff --git a/index.html b/index.html index 62b928425..da5ae8270 100644 --- a/index.html +++ b/index.html @@ -127,7 +127,7 @@