[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r108574: Auto-commit of generated fil
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r108574: Auto-commit of generated files. |
Date: |
Tue, 12 Jun 2012 06:17:28 -0400 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 108574
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2012-06-12 06:17:28 -0400
message:
Auto-commit of generated files.
modified:
autogen/config.in
autogen/configure
=== modified file 'autogen/config.in'
--- a/autogen/config.in 2012-06-10 10:18:41 +0000
+++ b/autogen/config.in 2012-06-12 10:17:28 +0000
@@ -525,6 +525,9 @@
/* 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 @@
/* 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
=== modified file 'autogen/configure'
--- a/autogen/configure 2012-06-10 13:20:58 +0000
+++ b/autogen/configure 2012-06-12 10:17:28 +0000
@@ -8073,6 +8073,7 @@
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 @@
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 @@
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
@@ -10423,6 +10436,17 @@
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
+
fi
fi
fi
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r108574: Auto-commit of generated files.,
Glenn Morris <=