From: Glenn Morris <rgm@gnu.org>
Date: Tue, 12 Jun 2012 10:17:28 +0000 (-0400)
Subject: Auto-commit of generated files.
X-Git-Tag: emacs-24.2.90~1199^2~474^2~39
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=15f79fcd6ca07c0724d707879f31d49789d4b0b7;p=emacs.git

Auto-commit of generated files.
---

diff --git a/autogen/config.in b/autogen/config.in
index 591fa969c83..ad6cccf3c87 100644
--- a/autogen/config.in
+++ b/autogen/config.in
@@ -525,6 +525,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if you have the `MagickExportImagePixels' function. */
 #undef HAVE_MAGICKEXPORTIMAGEPIXELS
 
+/* Define to 1 if you have the `MagickMergeImageLayers' function. */
+#undef HAVE_MAGICKMERGEIMAGELAYERS
+
 /* Define to 1 if you have the <maillock.h> header file. */
 #undef HAVE_MAILLOCK_H
 
@@ -1054,6 +1057,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to use system malloc. */
 #undef SYSTEM_MALLOC
 
+/* The type of system you are compiling for; sets `system-type'. */
+#undef SYSTEM_TYPE
+
 /* Define to 1 if you use terminfo instead of termcap. */
 #undef TERMINFO
 
diff --git a/autogen/configure b/autogen/configure
index fcaec777701..3d13968f14d 100755
--- a/autogen/configure
+++ b/autogen/configure
@@ -8073,6 +8073,7 @@ fi
 LIB_MATH=-lm
 LIB_STANDARD=
 START_FILES=
+SYSTEM_TYPE=`echo $opsys | sed -e 's/0-9.*//' -e 's|-|/|'`
 
 case $opsys in
   cygwin )
@@ -8087,6 +8088,7 @@ case $opsys in
   freebsd )
     LIB_STANDARD='-lgcc -lc -lgcc $(CRT_DIR)/crtend.o $(CRT_DIR)/crtn.o'
     START_FILES='pre-crt0.o $(CRT_DIR)/crt1.o $(CRT_DIR)/crti.o $(CRT_DIR)/crtbegin.o'
+    SYSTEM_TYPE=berkeley-unix
     ;;
   gnu-linux | gnu-kfreebsd )
     LIB_STANDARD='-lgcc -lc -lgcc $(CRT_DIR)/crtn.o'
@@ -8099,12 +8101,23 @@ case $opsys in
     netbsd | openbsd )
     LIB_STANDARD='-lgcc -lc -lgcc $(CRT_DIR)/crtend.o'
     START_FILES='pre-crt0.o $(CRT_DIR)/crt0.o $(CRT_DIR)/crtbegin.o'
+    SYSTEM_TYPE=berkeley-unix
     ;;
+
+  sol2* | unixware )
+    SYSTEM_TYPE=usg-unix-v
+    ;;
+
 esac
 
 
 
 
+cat >>confdefs.h <<_ACEOF
+#define SYSTEM_TYPE "$SYSTEM_TYPE"
+_ACEOF
+
+
 crt_files=
 
 for file in x $LIB_STANDARD $START_FILES; do
@@ -10420,6 +10433,17 @@ if test "x$ac_cv_func_MagickExportImagePixels" = x""yes; then :
 #define HAVE_MAGICKEXPORTIMAGEPIXELS 1
 _ACEOF
 
+fi
+done
+
+      for ac_func in MagickMergeImageLayers
+do :
+  ac_fn_c_check_func "$LINENO" "MagickMergeImageLayers" "ac_cv_func_MagickMergeImageLayers"
+if test "x$ac_cv_func_MagickMergeImageLayers" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_MAGICKMERGEIMAGELAYERS 1
+_ACEOF
+
 fi
 done