From c6d7f1e78818d2221db4dcd06a4487e1db7a2b8b Mon Sep 17 00:00:00 2001 From: cristy Date: Thu, 8 Sep 2011 16:44:06 +0000 Subject: [PATCH] --- MagickCore/Magick-config | 63 ---------------------------------- MagickCore/Magick-config.1 | 69 -------------------------------------- MagickCore/version.h | 4 +-- MagickWand/Wand-config | 64 ----------------------------------- MagickWand/Wand-config.1 | 69 -------------------------------------- config/configure.xml | 4 +-- configure | 10 +----- configure.ac | 2 -- 8 files changed, 5 insertions(+), 280 deletions(-) delete mode 100755 MagickCore/Magick-config delete mode 100644 MagickCore/Magick-config.1 delete mode 100755 MagickWand/Wand-config delete mode 100644 MagickWand/Wand-config.1 diff --git a/MagickCore/Magick-config b/MagickCore/Magick-config deleted file mode 100755 index ea8b4c966..000000000 --- a/MagickCore/Magick-config +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/sh -# -# Configure options script for re-calling MagickCore compilation options -# required to use the MagickCore library. -# - -prefix=/usr/local -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include/ImageMagick - -usage="\ -Usage: Magick-config [--cflags] [--cppflags] [--exec-prefix] [--ldflags] [--libs] [--prefix] [--version]" - -if test $# -eq 0; then - echo "${usage}" 1>&2 - echo "Example: gcc \`Magick-config --cflags --cppflags\` -o core core.c \`Magick-config --ldflags --libs\`" 1>&2 - exit 1 -fi - -while test $# -gt 0; do - case "$1" in - -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; - *) optarg= ;; - esac - case $1 in - --prefix=*) - prefix=$optarg - ;; - --prefix) - echo $prefix - ;; - --exec-prefix=*) - exec_prefix=$optarg - ;; - --exec-prefix) - echo $exec_prefix - ;; - --version) - echo '6.7.1 Q16 ' - ;; - --cflags) - echo "-I${includedir} -fopenmp" - ;; - --cxxflags) - echo '-g -O2 -pthread' - ;; - --cppflags) - echo '-I/usr/local/include/ImageMagick' - ;; - --ldflags) - echo '-L/usr/local/lib ' - ;; - --libs) - echo "-L${libdir} -lMagickCore -llcms2 -ltiff -lfreetype -ljasper -ljpeg -lpng -lfontconfig -lXext -lXt -lSM -lICE -lX11 -llzma -lbz2 -lxml2 -lgvc -lgraph -lcdt -lz -lm -lgomp -lpthread -lltdl" - ;; - *) - echo "${usage}" 1>&2 - exit 1 - ;; - esac - shift -done diff --git a/MagickCore/Magick-config.1 b/MagickCore/Magick-config.1 deleted file mode 100644 index 5c2bc2ada..000000000 --- a/MagickCore/Magick-config.1 +++ /dev/null @@ -1,69 +0,0 @@ -.ad l -.nh -.TH Magick-Config 1 "2 May 2002" "ImageMagick" -.SH NAME -Magick-config \- get information about the installed version of ImageMagick -.SH SYNOPSIS -.B Magick-config -.B [--cflags] -.B [--cppflags] -.B [--exec-prefix] -.B [--ldflags] -.B [--libs] -.B [--prefix] -.B [--version] -.SH DESCRIPTION -.B Magick-config -prints the compiler and linker flags required to compile and link programs -that use the -.BR ImageMagick -Application Programmer Interface. -.SH EXAMPLES -To print the version of the installed distribution of -.BR ImageMagick , -use: - -.nf - Magick-config \-\-version -.fi - -To compile a program that calls the -.BR ImageMagick -Application Programmer Interface, use: - -.nf - cc `Magick-config \-\-cflags \-\-cppflags \-\-ldflags \-\-libs` program.c -.fi - -.SH OPTIONS -.TP -.B \-\-cflags -Print the compiler flags that were used to compile -.BR libMagick . -.TP -.B \-\-cppflags -Print the preprocessor flags that are needed to find the -.B ImageMagick -C include files and defines to ensure that the ImageMagick data structures match between -your program and the installed libraries. -.TP -.B \-\-exec-prefix -Print the directory under which target specific binaries and executables are installed. -.TP -.B \-\-ldflags -Print the linker flags that are needed to link with the -.B ImageMagick -library. -.TP -.B \-\-libs -Print the linker flags that are needed to link a program with -.BR libMagick . -.TP -.B \-\-version -Print the version of the -.B ImageMagick -distribution to standard output. -.SH LICENSE -See http://www.imagemagick.org/script/license.php. -.SH AUTHORS -John Cristy, ImageMagick Studio LLC diff --git a/MagickCore/version.h b/MagickCore/version.h index 8dfbcc833..218e40434 100644 --- a/MagickCore/version.h +++ b/MagickCore/version.h @@ -27,14 +27,14 @@ extern "C" { */ #define MagickPackageName "ImageMagick" #define MagickCopyright "Copyright (C) 1999-2011 ImageMagick Studio LLC" -#define MagickSVNRevision "5219" +#define MagickSVNRevision "5221" #define MagickLibVersion 0x700 #define MagickLibVersionText "7.0.0" #define MagickLibVersionNumber 5,0,0 #define MagickLibAddendum "-0" #define MagickLibInterface 5 #define MagickLibMinInterface 5 -#define MagickReleaseDate "2011-09-07" +#define MagickReleaseDate "2011-09-08" #define MagickChangeDate "20110801" #define MagickAuthoritativeURL "http://www.imagemagick.org" #if defined(MAGICKCORE_OPENMP_SUPPORT) diff --git a/MagickWand/Wand-config b/MagickWand/Wand-config deleted file mode 100755 index cd24d7f1c..000000000 --- a/MagickWand/Wand-config +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/sh -# -# Configure options script for re-calling MagickWand compilation options -# required to use the MagickWand library. -# - -prefix=/usr/local -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include/ImageMagick - -usage="\ -Usage: Wand-config [--cflags] [--cppflags] [--exec-prefix] [--ldflags] [--libs] [--prefix] [--version]" - -if test $# -eq 0; then - echo "${usage}" 1>&2 - echo "Example: gcc \`Wand-config --cflags --cppflags\` -o wand wand.c \`Wand-config --ldflags --libs\`" 1>&2 - exit 1 -fi - -while test $# -gt 0; do - case "$1" in - -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; - *) optarg= ;; - esac - case $1 in - --prefix=*) - prefix=$optarg - ;; - --prefix) - echo $prefix - ;; - --exec-prefix=*) - exec_prefix=$optarg - ;; - --exec-prefix) - echo $exec_prefix - ;; - --version) - echo '6.7.1 Q16 ' - ;; - --cflags) - echo "-I${includedir} -fopenmp" - ;; - --cxxflags) - echo '-g -O2 -pthread' - ;; - --cppflags) - echo '-I/usr/local/include/ImageMagick' - ;; - --ldflags) - echo '-L/usr/local/lib ' - ;; - --libs) - echo "-L${libdir} -lMagickWand -lMagickCore -llcms2 -ltiff -lfreetype -ljasper -ljpeg -lpng -lfontconfig -lXext -lXt -lSM -lICE -lX11 -llzma -lbz2 -lxml2 -lgvc -lgraph -lcdt -lz -lm -lgomp -lpthread -lltdl" - ;; - *) - echo "${usage}" 1>&2 - exit 1 - ;; - esac - shift -done - diff --git a/MagickWand/Wand-config.1 b/MagickWand/Wand-config.1 deleted file mode 100644 index e3213ce6a..000000000 --- a/MagickWand/Wand-config.1 +++ /dev/null @@ -1,69 +0,0 @@ -.ad l -.nh -.TH Wand-Config 1 "2 May 2002" "Wand" -.SH NAME -Wand-config \- get information about the installed version of the Magick Wand -.SH SYNOPSIS -.B Wand-config -.B [--cflags] -.B [--cppflags] -.B [--exec-prefix] -.B [--ldflags] -.B [--libs] -.B [--prefix] -.B [--version] -.SH DESCRIPTION -.B Wand-config -prints the compiler and linker flags required to compile and link programs -that use the -.BR Wand -Application Programmer Interface. -.SH EXAMPLES -To print the version of the installed distribution of -.BR Wand , -use: - -.nf - Wand-config \-\-version -.fi - -To compile a program that calls the -.BR Wand -Application Programmer Interface, use: - -.nf - cc `Wand-config \-\-cflags \-\-cppflags \-\-ldflags \-\-libs` program.c -.fi - -.SH OPTIONS -.TP -.B \-\-cflags -Print the compiler flags that were used to compile -.BR libWand . -.TP -.B \-\-cppflags -Print the preprocessor flags that are needed to find the -.B Wand -C include files and defines to ensure that the Wand data structures match between -your program and the installed libraries. -.TP -.B \-\-exec-prefix -Print the directory under which target specific binaries and executables are installed. -.TP -.B \-\-ldflags -Print the linker flags that are needed to link with the -.B Wand -library. -.TP -.B \-\-libs -Print the linker flags that are needed to link a program with -.BR libWand . -.TP -.B \-\-version -Print the version of the -.B Wand -distribution to standard output. -.SH COPYRIGHT -See http://www.imagemagick.org/script/license.php -.SH AUTHORS -John Cristy, ImageMagick Studio LLC diff --git a/config/configure.xml b/config/configure.xml index c378dc812..ccf7ac153 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -10,8 +10,8 @@ - - + + diff --git a/configure b/configure index ace020276..dd311a5e2 100755 --- a/configure +++ b/configure @@ -3583,7 +3583,7 @@ MAGICK_LIBRARY_CURRENT_MIN=`expr $MAGICK_LIBRARY_CURRENT - $MAGICK_LIBRARY_AGE` MAGICK_LIBRARY_VERSION_INFO=$MAGICK_LIBRARY_CURRENT:$MAGICK_LIBRARY_REVISION:$MAGICK_LIBRARY_AGE -MAGICK_SVN_REVISION=5219 +MAGICK_SVN_REVISION=5221 @@ -34543,12 +34543,8 @@ ac_config_commands="$ac_config_commands default" ac_config_commands="$ac_config_commands MagickCore-config.in" -ac_config_commands="$ac_config_commands Magick-config.in" - ac_config_commands="$ac_config_commands MagickWand-config.in" -ac_config_commands="$ac_config_commands Wand-config.in" - ac_config_commands="$ac_config_commands Magick++-config.in" ac_config_commands="$ac_config_commands PerlMagick/check.sh.in" @@ -35915,9 +35911,7 @@ do "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; "MagickCore-config.in") CONFIG_COMMANDS="$CONFIG_COMMANDS MagickCore-config.in" ;; - "Magick-config.in") CONFIG_COMMANDS="$CONFIG_COMMANDS Magick-config.in" ;; "MagickWand-config.in") CONFIG_COMMANDS="$CONFIG_COMMANDS MagickWand-config.in" ;; - "Wand-config.in") CONFIG_COMMANDS="$CONFIG_COMMANDS Wand-config.in" ;; "Magick++-config.in") CONFIG_COMMANDS="$CONFIG_COMMANDS Magick++-config.in" ;; "PerlMagick/check.sh.in") CONFIG_COMMANDS="$CONFIG_COMMANDS PerlMagick/check.sh.in" ;; @@ -37506,9 +37500,7 @@ _LT_EOF ;; "MagickCore-config.in":C) chmod +x MagickCore/MagickCore-config ;; - "Magick-config.in":C) chmod +x MagickCore/Magick-config ;; "MagickWand-config.in":C) chmod +x MagickWand/MagickWand-config ;; - "Wand-config.in":C) chmod +x MagickWand/Wand-config ;; "Magick++-config.in":C) chmod +x Magick++/bin/Magick++-config ;; "PerlMagick/check.sh.in":C) chmod +x PerlMagick/check.sh ;; diff --git a/configure.ac b/configure.ac index 61566c839..a85d5afcb 100755 --- a/configure.ac +++ b/configure.ac @@ -3623,9 +3623,7 @@ AC_SUBST(MAGICK_FEATURES) # Set configured scripts to executable. AC_CONFIG_COMMANDS([default],[],[]) AC_CONFIG_COMMANDS([MagickCore-config.in],[chmod +x MagickCore/MagickCore-config]) -AC_CONFIG_COMMANDS([Magick-config.in],[chmod +x MagickCore/Magick-config]) AC_CONFIG_COMMANDS([MagickWand-config.in],[chmod +x MagickWand/MagickWand-config]) -AC_CONFIG_COMMANDS([Wand-config.in],[chmod +x MagickWand/Wand-config]) AC_CONFIG_COMMANDS([Magick++-config.in],[chmod +x Magick++/bin/Magick++-config]) AC_CONFIG_COMMANDS([PerlMagick/check.sh.in],[chmod +x PerlMagick/check.sh]) -- 2.50.1