(no commit message)

diff --git a/MagickCore/version.h b/MagickCore/version.h
index c192568f0d36c7b59a1fb9709808b60c5ff43bde..557c38c74022313a72d55dd55fb7b011727bee9d 100644 (file)
--- 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  "5619"
+#define MagickSVNRevision  "5636"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  7,0,0

diff --git a/Makefile.in b/Makefile.in
index 654a46f4c3f971cb0083c353ec2f021916c986b0..891966a75c388a982a8f7d6f20e628cdc4630aa4 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -293,8 +293,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_func_fseeko.m4 \
        $(top_srcdir)/m4/lt~obsolete.m4 \
        $(top_srcdir)/m4/magick_check_pthread_lib.m4 \
        $(top_srcdir)/m4/magick_func_mmap_fileio.m4 \
-       $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/strerror_r.m4 \
-       $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \

diff --git a/config/configure.xml b/config/configure.xml
index 7757c323a27930ce19d4728303e30ef83c231a28..849531d4329d4aa69585dff92916df689f1bd146 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -10,7 +10,7 @@
   <configure name="VERSION" value="7.0.0"/>
   <configure name="LIB_VERSION" value="0x700"/>
   <configure name="LIB_VERSION_NUMBER" value="7,0,0,0"/>
-  <configure name="SVN_REVISION" value="5619" />
+  <configure name="SVN_REVISION" value="5636" />
   <configure name="RELEASE_DATE" value="2011-10-13"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>

diff --git a/configure b/configure
index 7ca3803fdb1178f55f7235cfadb9c589481cbf45..8bb64ab3f372a88d05d475327e7a24adffe47cdd 100755 (executable)
--- a/configure
+++ b/configure
@@ -3584,7 +3584,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=5619
+MAGICK_SVN_REVISION=5636
 
 
 
@@ -24703,6 +24703,7 @@ main ()
          char buf[100];
          char x = *strerror_r (0, buf, sizeof buf);
          char *p = strerror_r (0, buf, sizeof buf);
+         return !p || x;
 
   ;
   return 0;
@@ -24731,7 +24732,7 @@ main ()
 {
 char buf[100];
          char x = *strerror_r (0, buf, sizeof buf);
-         exit (!isalpha (x));
+         return ! isalpha (x);
   ;
   return 0;
 }

diff --git a/m4/strerror_r.m4 b/m4/strerror_r.m4
deleted file mode 100644 (file)
index bd28635..0000000
--- a/m4/strerror_r.m4
+++ /dev/null
@@ -1,59 +0,0 @@
-#serial 1003
-# Experimental replacement for the function in the latest CVS autoconf.
-# Use with the error.c file in ../lib.
-
-# Copyright 2001 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-undefine([AC_FUNC_STRERROR_R])
-
-# AC_FUNC_STRERROR_R
-# ------------------
-AC_DEFUN([AC_FUNC_STRERROR_R],
-[AC_CHECK_DECLS([strerror_r])
-AC_CHECK_FUNCS([strerror_r])
-AC_CACHE_CHECK([whether strerror_r returns char *],
-               ac_cv_func_strerror_r_char_p,
-   [
-    ac_cv_func_strerror_r_char_p=no
-    if test $ac_cv_have_decl_strerror_r = yes; then
-      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT],
-       [[
-         char buf[100];
-         char x = *strerror_r (0, buf, sizeof buf);
-         char *p = strerror_r (0, buf, sizeof buf);
-       ]])],
-                       ac_cv_func_strerror_r_char_p=yes)
-    else
-      # strerror_r is not declared.  Choose between
-      # systems that have relatively inaccessible declarations for the
-      # function.  BeOS and DEC UNIX 4.0 fall in this category, but the
-      # former has a strerror_r that returns char*, while the latter
-      # has a strerror_r that returns `int'.
-      # This test should segfault on the DEC system.
-      AC_RUN_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT
-       extern char *strerror_r ();],
-       [[char buf[100];
-         char x = *strerror_r (0, buf, sizeof buf);
-         exit (!isalpha (x));]])],
-                    ac_cv_func_strerror_r_char_p=yes, , :)
-    fi
-  ])
-if test $ac_cv_func_strerror_r_char_p = yes; then
-  AC_DEFINE([STRERROR_R_CHAR_P], 1,
-           [Define to 1 if strerror_r returns char *.])
-fi
-])# AC_FUNC_STRERROR_R