(no commit message)

[imagemagick] / configure.ac

diff --git a/configure.ac b/configure.ac
index deb671582afa9e7ca34ee3a38eec1e6dcfb4db57..0b14a2ea9de50a11b0a816eed7aa2f221e8ea498 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -16,20 +16,20 @@
 
 AC_PREREQ(2.64)
 
-m4_define([magick_major_version], [6])
-m4_define([magick_minor_version], [7])
-m4_define([magick_micro_version], [1])
+m4_define([magick_major_version], [7])
+m4_define([magick_minor_version], [0])
+m4_define([magick_micro_version], [0])
 m4_define([magick_version],
           [magick_major_version.magick_minor_version.magick_micro_version])
 m4_define([magick_svn_revision], esyscmd([sh -c "svnversion | sed -r 's/([0-9]+).*/\1/'"]))
 
 AC_INIT([ImageMagick],[magick_version],[http://www.imagemagick.org],[ImageMagick-magick_version])
-AC_CONFIG_SRCDIR([magick/MagickCore.h])
+AC_CONFIG_SRCDIR([MagickCore/MagickCore.h])
 AC_CONFIG_AUX_DIR([config])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_LIBOBJ_DIR([ltdl])
 AC_CONFIG_HEADERS([config/config.h])
-AX_PREFIX_CONFIG_H([magick/magick-config.h],[MagickCore])
+AX_PREFIX_CONFIG_H([MagickCore/magick-config.h],[MagickCore])
 AC_CONFIG_FILES([\
     config/configure.xml \
     config/delegates.xml \
@@ -42,13 +42,12 @@ AC_CONFIG_FILES([\
     config/type.xml \
     ImageMagick.spec \
     Magick++/bin/Magick++-config \
-    magick/ImageMagick.pc \
+    MagickCore/ImageMagick.pc \
     Magick++/lib/ImageMagick++.pc \
     Magick++/lib/Magick++.pc \
-    magick/Magick-config \
-    magick/MagickCore-config \
-    magick/MagickCore.pc \
-    magick/version.h \
+    MagickCore/MagickCore-config \
+    MagickCore/MagickCore.pc \
+    MagickCore/version.h \
     Makefile \
     magick.sh \
     PerlMagick/Magick.pm \
@@ -66,10 +65,8 @@ AC_CONFIG_FILES([\
     utilities/mogrify.1 \
     utilities/montage.1 \
     utilities/stream.1 \
-    wand/MagickWand-config \
-    wand/MagickWand.pc \
-    wand/Wand-config \
-    wand/Wand.pc ])
+    MagickWand/MagickWand-config \
+    MagickWand/MagickWand.pc ])
 
 #
 # Save initial user-tunable values
@@ -116,6 +113,7 @@ AC_SUBST([MAGICK_SVN_REVISION],[magick_svn_revision])
 
 AC_SUBST(PACKAGE_NAME)dnl
 AC_SUBST(PACKAGE_VERSION)dnl
+AC_SUBST(PACKAGE_PERL_VERSION)dnl
 AC_SUBST(PACKAGE_RELEASE)dnl
 AC_SUBST(PACKAGE_CHANGE_DATE)dnl
 AC_SUBST(PACKAGE_LIB_VERSION)dnl
@@ -1054,7 +1052,7 @@ AC_CHECK_LIB(m,sqrt,MATH_LIBS="-lm",,)
 LIBS="$MATH_LIBS $LIBS"
 AC_SUBST(MATH_LIBS)
 
-AC_CHECK_FUNCS([atoll atexit cabs carg cimag creal clock ctime_r directio _exit execvp fchmod floor fork ftime ftruncate getc_unlocked getcwd getpid getexecname getdtablesize getpagesize getrlimit getrusage gettimeofday gmtime_r j0 j1 lltostr localtime_r lstat memmove memset mkstemp munmap nanosleep newlocale _NSGetExecutablePath pclose _pclose poll popen _popen posix_fadvise posix_fallocate posix_madvise posix_memalign posix_spawnp pow pread pwrite qsort_r raise rand_r readlink readdir_r realpath select seekdir setlocale sqrt setvbuf stat strchr strerror_r strrchr strcspn strdup strpbrk strspn strstr strtod strtod_l strtol strtoul symlink sysconf sigemptyset sigaction spawnvp strerror strlcat strlcpy strcasecmp strncasecmp telldir tempnam times ulltostr uselocale usleep utime vfprintf vfprintf_l vsprintf vsnprintf vsnprintf_l waitpid _wfopen _wstat])
+AC_CHECK_FUNCS([acosh asinh atanh atoll atexit cabs carg cimag creal clock ctime_r directio _exit execvp fchmod floor fork ftime ftruncate getc_unlocked getcwd getpid getexecname getdtablesize getpagesize getrlimit getrusage gettimeofday gmtime_r j0 j1 lltostr localtime_r lstat memmove memset mkstemp munmap nanosleep newlocale _NSGetExecutablePath pclose _pclose poll popen _popen posix_fadvise posix_fallocate posix_madvise posix_memalign posix_spawnp pow pread pwrite qsort_r raise rand_r readlink readdir_r realpath select seekdir setlocale sqrt setvbuf stat strchr strerror_r strrchr strcspn strdup strpbrk strspn strstr strtod strtod_l strtol strtoul symlink sysconf sigemptyset sigaction spawnvp strerror strlcat strlcpy strcasecmp strncasecmp telldir tempnam times ulltostr uselocale usleep utime vfprintf vfprintf_l vsprintf vsnprintf vsnprintf_l waitpid _wfopen _wstat])
 
 #
 # Check for clock_gettime().
@@ -3402,7 +3400,7 @@ if test $with_perl_static = 'yes'; then
     libtool_objdir=$objdir
 
     # Linker search path to library, followed by -lMagickCore
-    MAGICKCORE_PATH="${builddir}/magick/${libtool_objdir}"
+    MAGICKCORE_PATH="${builddir}/MagickCore/${libtool_objdir}"
 fi
 AC_SUBST(MAGICKCORE_PATH)
 
@@ -3548,10 +3546,10 @@ AC_SUBST(MAGICK_FEATURES)
 
 # Set configured scripts to executable.
 AC_CONFIG_COMMANDS([default],[],[])
-AC_CONFIG_COMMANDS([MagickCore-config.in],[chmod +x magick/MagickCore-config])
-AC_CONFIG_COMMANDS([Magick-config.in],[chmod +x magick/Magick-config])
-AC_CONFIG_COMMANDS([MagickWand-config.in],[chmod +x wand/MagickWand-config])
-AC_CONFIG_COMMANDS([Wand-config.in],[chmod +x wand/Wand-config])
+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])