diff --git a/MagickCore/magick-config.h b/MagickCore/magick-config.h
index e7d4df5..9a9c721 100644
--- a/MagickCore/magick-config.h
+++ b/MagickCore/magick-config.h
@@ -12,9 +12,7 @@
/* #undef AUTOTRACE_DELEGATE */
/* Define if coders and filters are to be built as modules. */
-#ifndef MAGICKCORE_BUILD_MODULES
-#define MAGICKCORE_BUILD_MODULES 1
-#endif
+/* #undef BUILD_MODULES */
/* Define if you have the bzip2 library */
#ifndef MAGICKCORE_BZLIB_DELEGATE
@@ -1119,9 +1117,7 @@
/* #undef LQR_DELEGATE */
/* Define if using libltdl to support dynamically loadable modules */
-#ifndef MAGICKCORE_LTDL_DELEGATE
-#define MAGICKCORE_LTDL_DELEGATE 1
-#endif
+/* #undef LTDL_DELEGATE */
/* Define to the sub-directory in which libtool stores uninstalled libraries.
*/
diff --git a/MagickCore/version.h b/MagickCore/version.h
index 193fd94..0c7c3fc 100644
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,7 +27,7 @@
*/
#define MagickPackageName "ImageMagick"
#define MagickCopyright "Copyright (C) 1999-2012 ImageMagick Studio LLC"
-#define MagickSVNRevision "9640M"
+#define MagickSVNRevision "9640:9642M"
#define MagickLibVersion 0x700
#define MagickLibVersionText "7.0.0"
#define MagickLibVersionNumber 7,0,0
diff --git a/PerlMagick/Makefile.PL b/PerlMagick/Makefile.PL
index c6f83e2..8356d5b 100644
--- a/PerlMagick/Makefile.PL
+++ b/PerlMagick/Makefile.PL
@@ -156,9 +156,9 @@
}
# defaults for LIBS & INC & CCFLAGS params that we later pass to Writemakefile
-my $INC_magick = '-I../ -I.. -I/usr/include/freetype2 -I/usr/include/libxml2 -I"' . $Config{'usrinc'} . '/ImageMagick"';
+my $INC_magick = '-I../ -I.. -pthread -I/usr/include/pango-1.0 -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng15 -I/usr/include/freetype2 -I/usr/include/libxml2 -I"' . $Config{'usrinc'} . '/ImageMagick"';
my $LIBS_magick = '-L../MagickCore/.libs -lMagickCore -lperl -lm';
-my $CCFLAGS_magick = "$Config{'ccflags'} -fopenmp -g -O2 -Wall -pthread";
+my $CCFLAGS_magick = "$Config{'ccflags'} -pthread -I/usr/include/OpenEXR -fopenmp -g -O2 -Wall -pthread";
my $LDFLAGS_magick = "-L../MagickCore/.libs -lMagickCore $Config{'ldflags'} -L/usr/lib";
my $LDDLFLAGS_magick = "-L../MagickCore/.libs -lMagickCore $Config{'lddlflags'} -L/usr/lib";
@@ -201,7 +201,7 @@
#'CC' => 'gcc -std=gnu99 -std=gnu99',
# C pre-processor flags (e.g. -I & -D options)
- # 'CPPFLAGS' => "$Config{'cppflags'} -I/usr/include/freetype2 -I/usr/include/libxml2",
+ # 'CPPFLAGS' => "$Config{'cppflags'} -pthread -I/usr/include/pango-1.0 -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng15 -I/usr/include/freetype2 -I/usr/include/libxml2",
# C compiler flags (e.g. -O -g)
'CCFLAGS' => $CCFLAGS_magick,
diff --git a/configure b/configure
index fedb590..94bab06 100755
--- a/configure
+++ b/configure
@@ -3633,7 +3633,7 @@
MAGICK_LIBRARY_VERSION_INFO=$MAGICK_LIBRARY_CURRENT:$MAGICK_LIBRARY_REVISION:$MAGICK_LIBRARY_AGE
-MAGICK_SVN_REVISION=9640M
+MAGICK_SVN_REVISION=9640:9642M
@@ -20628,7 +20628,7 @@
#
# Enable support for building loadable modules
#
-build_modules='yes'
+build_modules='no'
# Check whether --with-modules was given.
if test "${with_modules+set}" = set; then :
@@ -27595,6 +27595,12 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
+ if test "$have_ltdl" != 'yes' ; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 1 "libltdl is required for modules build
+See \`config.log' for more details" "$LINENO" 5; }
+ fi
fi
if test "$have_ltdl" != 'no'; then
WITH_LTDL_TRUE=
diff --git a/configure.ac b/configure.ac
index 1141ed0..e639026 100755
--- a/configure.ac
+++ b/configure.ac
@@ -519,7 +519,7 @@
#
# Enable support for building loadable modules
#
-build_modules='yes'
+build_modules='no'
AC_ARG_WITH([modules],
[AC_HELP_STRING([--with-modules],
[enable building dynamically loadable modules])],
@@ -1558,22 +1558,25 @@
AC_MSG_NOTICE([])
failed=0
passed=0
- AC_CHECK_HEADER(ltdl.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`)
- AC_CHECK_LIB([ltdl],[lt_dlinit],passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
- AC_MSG_CHECKING(if libltdl package is complete)
+ AC_CHECK_HEADER([ltdl.h],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`])
+ AC_CHECK_LIB([ltdl],[lt_dlinit],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`],)
+ AC_MSG_CHECKING([if libltdl package is complete])
if test $passed -gt 0 ; then
if test $failed -gt 0 ; then
- AC_MSG_RESULT(no -- some components failed test)
+ AC_MSG_RESULT([no -- some components failed test])
have_ltdl='no (failed tests)'
else
LTDL_LIBS='-lltdl'
LIBS="$LTDL_LIBS $LIBS"
- AC_DEFINE(LTDL_DELEGATE,1,Define if using libltdl to support dynamically loadable modules)
- AC_MSG_RESULT(yes)
+ AC_DEFINE(LTDL_DELEGATE,1,[Define if using libltdl to support dynamically loadable modules])
+ AC_MSG_RESULT([yes])
have_ltdl='yes'
fi
else
- AC_MSG_RESULT(no)
+ AC_MSG_RESULT([no])
+ fi
+ if test "$have_ltdl" != 'yes' ; then
+ AC_MSG_FAILURE([libltdl is required for modules build],[1])
fi
fi
AM_CONDITIONAL(WITH_LTDL, test "$have_ltdl" != 'no')