From 0151ae10d47c40e11be2d161112c27adbcf6938a Mon Sep 17 00:00:00 2001 From: cristy Date: Fri, 28 Oct 2011 16:32:29 +0000 Subject: [PATCH] --- MagickCore/configure.c | 4 ++++ MagickCore/magick-config.h | 10 +++++++++ MagickCore/version.h | 2 +- config/config.h.in | 6 ++++++ config/configure.xml | 2 +- configure | 44 ++++++++++++++++++++++++++++++++++++-- configure.ac | 24 ++++++++++++++++++++- 7 files changed, 87 insertions(+), 5 deletions(-) diff --git a/MagickCore/configure.c b/MagickCore/configure.c index 3e2cfda11..3971eae12 100644 --- a/MagickCore/configure.c +++ b/MagickCore/configure.c @@ -676,6 +676,10 @@ MagickExport LinkedListInfo *GetConfigurePaths(const char *filename, (void) AppendValueToLinkedList(paths,ConstantString( MAGICKCORE_CONFIGURE_PATH)); #endif +#if defined(MAGICKCORE_CONFIGDIR_ARCH) + (void) AppendValueToLinkedList(paths,ConstantString( + MAGICKCORE_CONFIGDIR_ARCH)); +#endif #if defined(MAGICKCORE_DOCUMENTATION_PATH) (void) AppendValueToLinkedList(paths,ConstantString( MAGICKCORE_DOCUMENTATION_PATH)); diff --git a/MagickCore/magick-config.h b/MagickCore/magick-config.h index bd6180dae..46a194b77 100644 --- a/MagickCore/magick-config.h +++ b/MagickCore/magick-config.h @@ -42,6 +42,11 @@ #define MAGICKCORE_CODER_RELATIVE_PATH "ImageMagick-7.0.0/modules-Q16/coders" #endif +/* ARCH specific config directory */ +#ifndef MAGICKCORE_CONFIGDIR_ARCH +#define MAGICKCORE_CONFIGDIR_ARCH "/usr/local/lib/ImageMagick-7.0.0" +#endif + /* Directory where architecture-dependent configuration files live. */ #ifndef MAGICKCORE_CONFIGURE_PATH #define MAGICKCORE_CONFIGURE_PATH "/usr/local/etc/ImageMagick/" @@ -1165,6 +1170,11 @@ /* Define if you have umem memory allocation library */ /* #undef HasUMEM */ +/* ARCH specific include directory */ +#ifndef MAGICKCORE_INCLUDEDIR_ARCH +#define MAGICKCORE_INCLUDEDIR_ARCH "/usr/local/include" +#endif + /* ImageMagick is formally installed under prefix */ #ifndef MAGICKCORE_INSTALLED_SUPPORT #define MAGICKCORE_INSTALLED_SUPPORT 1 diff --git a/MagickCore/version.h b/MagickCore/version.h index eb94b4cdc..2949c45d7 100644 --- a/MagickCore/version.h +++ b/MagickCore/version.h @@ -27,7 +27,7 @@ extern "C" { */ #define MagickPackageName "ImageMagick" #define MagickCopyright "Copyright (C) 1999-2011 ImageMagick Studio LLC" -#define MagickSVNRevision "5750" +#define MagickSVNRevision "5778" #define MagickLibVersion 0x700 #define MagickLibVersionText "7.0.0" #define MagickLibVersionNumber 7,0,0 diff --git a/config/config.h.in b/config/config.h.in index ea5cf288f..3761604f5 100644 --- a/config/config.h.in +++ b/config/config.h.in @@ -27,6 +27,9 @@ /* Subdirectory of lib where coder modules are installed */ #undef CODER_RELATIVE_PATH +/* ARCH specific config directory */ +#undef CONFIGDIR_ARCH + /* Directory where architecture-dependent configuration files live. */ #undef CONFIGURE_PATH @@ -764,6 +767,9 @@ /* Define if you have umem memory allocation library */ #undef HasUMEM +/* ARCH specific include directory */ +#undef INCLUDEDIR_ARCH + /* ImageMagick is formally installed under prefix */ #undef INSTALLED_SUPPORT diff --git a/config/configure.xml b/config/configure.xml index 02e4e8fd6..09db7bf03 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -10,7 +10,7 @@ - + diff --git a/configure b/configure index 757e3abb7..78752d3ee 100755 --- a/configure +++ b/configure @@ -1083,6 +1083,8 @@ with_gnu_ld with_dmalloc enable_bounds_checking enable_osx_universal_binary +with_includedir_arch +with_configdir_arch with_threads enable_openmp enable_opencl @@ -1850,6 +1852,8 @@ Optional Packages: --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-dmalloc use dmalloc, as in http://www.dmalloc.com/dmalloc.tar.gz + --includedir-arch=DIR ARCH specific include directory + --configdir-arch=DIR ARCH specific config directory --without-threads disable threads support --with-pic try to use only PIC/non-PIC objects [default=use both] @@ -3596,7 +3600,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=5750 +MAGICK_SVN_REVISION=5778 @@ -8249,6 +8253,43 @@ Please re-run configure with these options: ;; esac +# +# ARCH specific include directory +# + +# Check whether --with-includedir-arch was given. +if test "${with_includedir_arch+set}" = set; then : + withval=$with_includedir_arch; includedir_arch=$withval +else + includedir_arch=$INCLUDE_DIR +fi + + + +cat >>confdefs.h <<_ACEOF +#define INCLUDEDIR_ARCH "$includedir_arch" +_ACEOF + + +# +# ARCH specific configuration directory +# + +# Check whether --with-configdir-arch was given. +if test "${with_configdir_arch+set}" = set; then : + withval=$with_configdir_arch; configdir_arch=$withval +else + configdir_arch="${LIB_DIR}/${PACKAGE_NAME}-${PACKAGE_VERSION}" +fi + + + +cat >>confdefs.h <<_ACEOF +#define CONFIGDIR_ARCH "$configdir_arch" +_ACEOF + + +# # Enable support for threads # Check whether --with-threads was given. @@ -9712,7 +9753,6 @@ fi fi -# # Configure libtool enable_dlopen=yes diff --git a/configure.ac b/configure.ac index bd73a1e02..0826a07cd 100755 --- a/configure.ac +++ b/configure.ac @@ -376,6 +376,29 @@ Please re-run configure with these options: ;; esac +# +# ARCH specific include directory +# +AC_ARG_WITH([includedir-arch], + [AC_HELP_STRING([--includedir-arch=DIR], + [ARCH specific include directory])], + [includedir_arch=$withval], + [includedir_arch=$INCLUDE_DIR]) + +AC_DEFINE_UNQUOTED(INCLUDEDIR_ARCH,"$includedir_arch",[ARCH specific include directory]) + +# +# ARCH specific configuration directory +# +AC_ARG_WITH([configdir-arch], + [AC_HELP_STRING([--configdir-arch=DIR], + [ARCH specific config directory])], + [configdir_arch=$withval], + [configdir_arch="${LIB_DIR}/${PACKAGE_NAME}-${PACKAGE_VERSION}"]) + +AC_DEFINE_UNQUOTED(CONFIGDIR_ARCH,"$configdir_arch",[ARCH specific config directory]) + +# # Enable support for threads AC_ARG_WITH([threads], [AC_HELP_STRING([--without-threads], [disable threads support])], @@ -459,7 +482,6 @@ if test "$enable_largefile" != no; then fi AC_SUBST(LFS_CPPFLAGS) -# # Configure libtool AC_LIBTOOL_DLOPEN LT_INIT([win32-dll]) -- 2.40.0