diff --git a/MagickCore/version.h b/MagickCore/version.h
index 920a4e1..3b5d523 100644
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,14 +27,14 @@
*/
#define MagickPackageName "ImageMagick"
#define MagickCopyright "Copyright (C) 1999-2013 ImageMagick Studio LLC"
-#define MagickSVNRevision "11008:11057M"
+#define MagickSVNRevision "11008:11080M"
#define MagickLibVersion 0x700
#define MagickLibVersionText "7.0.0"
#define MagickLibVersionNumber 1,0,0
#define MagickLibAddendum "-0"
#define MagickLibInterface 1
#define MagickLibMinInterface 1
-#define MagickReleaseDate "2013-02-16"
+#define MagickReleaseDate "2013-02-18"
#define MagickChangeDate "20121005"
#define MagickAuthoritativeURL "http://www.imagemagick.org"
#define MagickFeatures "DPC HDRI OpenMP"
diff --git a/Makefile.in b/Makefile.in
index f7bc3c7..2c841f1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2831,6 +2831,9 @@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
+
+# Pkgconfig directory
+pkgconfigdir = $(libdir)/pkgconfig
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
@@ -4949,9 +4952,6 @@
@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@PERLMAGICK_CHECKSCRPTS =
@WITH_PERL_DYNAMIC_FALSE@@WITH_PERL_STATIC_TRUE@@WITH_PERL_TRUE@PERLSTATICNAME = PerlMagick
-# Pkgconfig directory
-pkgconfigdir = $(libdir)/pkgconfig
-
# Files to install in Pkgconfig directory
pkgconfig_DATA = \
$(MAGICKCORE_PKGCONFIG) \
diff --git a/configure b/configure
index 0c52ea3..756b517 100755
--- a/configure
+++ b/configure
@@ -926,6 +926,7 @@
PTHREAD_LIBS
PTHREAD_CC
ax_pthread_config
+pkgconfigdir
SHAREARCH_DIR
INCLUDEARCH_DIR
WinPathScript
@@ -1109,6 +1110,7 @@
enable_osx_universal_binary
with_includearch_dir
with_sharearch_dir
+with_pkgconfigdir
with_threads
enable_openmp
enable_opencl
@@ -1886,6 +1888,7 @@
instead of guessing
--includearch-dir=DIR ARCH specific include directory
--sharearch-dir=DIR ARCH specific config directory
+ --with-pkgconfigdir=DIR Path to the pkgconfig directory [LIBDIR/pkgconfig]
--without-threads disable threads support
--with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use
both]
@@ -3668,7 +3671,7 @@
MAGICK_VERSION=7.0.0-0
-MAGICK_SVN_REVISION=11008:11057M
+MAGICK_SVN_REVISION=11008:11080M
# Substitute library versioning
@@ -8985,6 +8988,17 @@
eval "eval SHAREARCH_DIR=$sharearch_dir"
+# Path to the pkgconfig folder
+
+# Check whether --with-pkgconfigdir was given.
+if test "${with_pkgconfigdir+set}" = set; then :
+ withval=$with_pkgconfigdir; pkgconfigdir="$withval"
+else
+ pkgconfigdir='${libdir}/pkgconfig'
+fi
+
+
+
#
# Enable support for threads
@@ -9065,7 +9079,7 @@
# which indicates that we try without any flags at all, and "pthread-config"
# which is a program returning the flags for the Pth emulation library.
-ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt lpthread pthread-config"
+ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
# The ordering *is* (sometimes) important. Some notes on the
# individual items follow:
@@ -9087,8 +9101,8 @@
# --thread-safe: KAI C++
# pthread-config: use pthread-config program (for GNU Pth library)
-case "${host_cpu}-${host_os}" in
- *solaris*)
+case ${host_os} in
+ solaris*)
# On Solaris (at least, for some versions), libc contains stubbed
# (non-functional) versions of the pthreads routines, so link-based
@@ -9101,7 +9115,7 @@
ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags"
;;
- *-darwin*)
+ darwin*)
ax_pthread_flags="-pthread $ax_pthread_flags"
;;
esac
@@ -9266,9 +9280,16 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if more special flags are required for pthreads" >&5
$as_echo_n "checking if more special flags are required for pthreads... " >&6; }
flag=no
- case "${host_cpu}-${host_os}" in
- *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";;
- *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";;
+ case ${host_os} in
+ aix* | freebsd* | darwin*) flag="-D_THREAD_SAFE";;
+ osf* | hpux*) flag="-D_REENTRANT";;
+ solaris*)
+ if test "$GCC" = "yes"; then
+ flag="-D_REENTRANT"
+ else
+ flag="-mt -D_REENTRANT"
+ fi
+ ;;
esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${flag}" >&5
$as_echo "${flag}" >&6; }
@@ -9550,7 +9571,7 @@
# which indicates that we try without any flags at all, and "pthread-config"
# which is a program returning the flags for the Pth emulation library.
-ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt lpthread pthread-config"
+ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
# The ordering *is* (sometimes) important. Some notes on the
# individual items follow:
@@ -9572,8 +9593,8 @@
# --thread-safe: KAI C++
# pthread-config: use pthread-config program (for GNU Pth library)
-case "${host_cpu}-${host_os}" in
- *solaris*)
+case ${host_os} in
+ solaris*)
# On Solaris (at least, for some versions), libc contains stubbed
# (non-functional) versions of the pthreads routines, so link-based
@@ -9586,7 +9607,7 @@
ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags"
;;
- *-darwin*)
+ darwin*)
ax_pthread_flags="-pthread $ax_pthread_flags"
;;
esac
@@ -9751,9 +9772,16 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if more special flags are required for pthreads" >&5
$as_echo_n "checking if more special flags are required for pthreads... " >&6; }
flag=no
- case "${host_cpu}-${host_os}" in
- *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";;
- *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";;
+ case ${host_os} in
+ aix* | freebsd* | darwin*) flag="-D_THREAD_SAFE";;
+ osf* | hpux*) flag="-D_REENTRANT";;
+ solaris*)
+ if test "$GCC" = "yes"; then
+ flag="-D_REENTRANT"
+ else
+ flag="-mt -D_REENTRANT"
+ fi
+ ;;
esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${flag}" >&5
$as_echo "${flag}" >&6; }
diff --git a/configure.ac b/configure.ac
index c5fa742..6c1dd06 100755
--- a/configure.ac
+++ b/configure.ac
@@ -430,6 +430,12 @@
eval "eval SHAREARCH_DIR=$sharearch_dir"
AC_SUBST(SHAREARCH_DIR)
+# Path to the pkgconfig folder
+AC_ARG_WITH([pkgconfigdir], AS_HELP_STRING([--with-pkgconfigdir=DIR],
+ [Path to the pkgconfig directory @<:@LIBDIR/pkgconfig@:>@]),
+ [pkgconfigdir="$withval"], [pkgconfigdir='${libdir}/pkgconfig'])
+AC_SUBST([pkgconfigdir])
+
#
# Enable support for threads
AC_ARG_WITH([threads],
diff --git a/m4/ax_pthread.m4 b/m4/ax_pthread.m4
index 23a307d..d90de34 100644
--- a/m4/ax_pthread.m4
+++ b/m4/ax_pthread.m4
@@ -82,7 +82,7 @@
# modified version of the Autoconf Macro, you may extend this special
# exception to the GPL to apply to your modified version as well.
-#serial 16
+#serial 18
AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD])
AC_DEFUN([AX_PTHREAD], [
@@ -123,7 +123,7 @@
# which indicates that we try without any flags at all, and "pthread-config"
# which is a program returning the flags for the Pth emulation library.
-ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt lpthread pthread-config"
+ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
# The ordering *is* (sometimes) important. Some notes on the
# individual items follow:
@@ -145,8 +145,8 @@
# --thread-safe: KAI C++
# pthread-config: use pthread-config program (for GNU Pth library)
-case "${host_cpu}-${host_os}" in
- *solaris*)
+case ${host_os} in
+ solaris*)
# On Solaris (at least, for some versions), libc contains stubbed
# (non-functional) versions of the pthreads routines, so link-based
@@ -159,7 +159,7 @@
ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags"
;;
- *-darwin*)
+ darwin*)
ax_pthread_flags="-pthread $ax_pthread_flags"
;;
esac
@@ -254,9 +254,16 @@
AC_MSG_CHECKING([if more special flags are required for pthreads])
flag=no
- case "${host_cpu}-${host_os}" in
- *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";;
- *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";;
+ case ${host_os} in
+ aix* | freebsd* | darwin*) flag="-D_THREAD_SAFE";;
+ osf* | hpux*) flag="-D_REENTRANT";;
+ solaris*)
+ if test "$GCC" = "yes"; then
+ flag="-D_REENTRANT"
+ else
+ flag="-mt -D_REENTRANT"
+ fi
+ ;;
esac
AC_MSG_RESULT(${flag})
if test "x$flag" != xno; then