(no commit message)

diff --git a/config/configure.xml b/config/configure.xml
index 5be36bec418a58af9f9f3ad202865f49223e9c01..394a7aa857a19bc635740e1743299de53a912156 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -23,7 +23,7 @@
   <configure name="LIBS" value="-lMagickCore -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -ldjvulibre -lfftw3 -lfontconfig -lwmf -lwmflite -lXext -lXt -lSM -lICE -lX11 -lbz2 -pthread -lrsvg-2 -lgdk_pixbuf-2.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lxml2 -lz -lm -lgomp -lpthread -lltdl"/>
   <configure name="CXX" value="g++"/>
   <configure name="CXXFLAGS" value="-g -O2 -Wall -W -pthread"/>
-  <configure name="DISTCHECK_CONFIG_FLAGS" value="--disable-deprecated --with-quantum-depth=16 --with-umem=no --with-autotrace=no --with-gslib=no --with-fontpath="/>
+  <configure name="DISTCHECK_CONFIG_FLAGS" value="--disable-deprecated --with-quantum-depth=16 --with-umem=no --with-autotrace=no --with-gslib=no --with-fontpath= --with-perl=no"/>
   <configure name="HOST" value="x86_64-unknown-linux-gnu"/>
   <configure name="DELEGATES" value="bzlib djvu fftw fontconfig freetype jpeg jng jp2 lcms mpeg png rsvg tiff x11 xml wmf zlib"/>
   <configure name="COPYRIGHT" value="Copyright (C) 1999-2010 ImageMagick Studio LLC"/>

diff --git a/configure b/configure
index 7303eb0eab7452bb1223d92375ce42d2bc48a3aa..d2afb12424432516494c8a01b61a8d7637c8f4b4 100755 (executable)
--- a/configure
+++ b/configure
@@ -19933,7 +19933,7 @@ fi
 if test "${with_perl+set}" = set; then :
   withval=$with_perl; with_perl=$withval
 else
-  with_perl=$libtool_build_shared_libs
+  with_perl='no'
 fi
 
 

diff --git a/configure.ac b/configure.ac
index c8774d89a6310ce910b820da7bbfa107f3806cce..20f50c317d07216502660d2449f19faffd925035 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -698,7 +698,7 @@ AC_ARG_WITH([perl],
     [AC_HELP_STRING([--with-perl],
                     [enable build/install of PerlMagick])],
     [with_perl=$withval],
-    [with_perl=$libtool_build_shared_libs])
+    [with_perl='no'])
 
 # Options to pass when configuring PerlMagick
 AC_ARG_WITH([perl-options],

diff --git a/ltdl/lt__dirent.c b/ltdl/lt__dirent.c
index c9533b6bccb01399c142e341897f06751fec8ac6..30dc072c136be6ca6fed979f5979f84de9a1e34d 100644 (file)
--- a/ltdl/lt__dirent.c
+++ b/ltdl/lt__dirent.c
@@ -35,7 +35,7 @@ or obtained by writing to the Free Software Foundation, Inc.,
 
 #include "lt__dirent.h"
 
-#if defined(MAGICKCORE_WINDOWS_SUPPORT)
+#if defined(__WINDOWS__)
 
 void
 closedir (DIR *entry)
@@ -104,4 +104,4 @@ readdir (DIR *entry)
   return &entry->file_info;
 }
 
-#endif /*defined(MAGICKCORE_WINDOWS_SUPPORT)*/
+#endif /*defined(__WINDOWS__)*/