aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Schwab2010-11-06 11:31:56 +0100
committerAndreas Schwab2010-11-06 11:31:56 +0100
commit4abfb7532c948b4c8305e7590b95f8a512fea6d3 (patch)
treebaff8fad238d9c980779b89efbe145c263ae11a8
parent80417b95f4367986efcf91dbe3113d37fe25d981 (diff)
downloademacs-4abfb7532c948b4c8305e7590b95f8a512fea6d3.tar.gz
emacs-4abfb7532c948b4c8305e7590b95f8a512fea6d3.zip
configure.in: Fix indentation
-rw-r--r--ChangeLog4
-rwxr-xr-xconfigure2
-rw-r--r--configure.in2
-rw-r--r--src/config.in18
4 files changed, 15 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 33a7cf784ab..1e3373df6df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
12010-11-06 Andreas Schwab <schwab@linux-m68k.org>
2
3 * configure.in: Fix indentation.
4
12010-10-31 Ken Brown <kbrown@cornell.edu> 52010-10-31 Ken Brown <kbrown@cornell.edu>
2 6
3 * configure.in (checking whether localtime caches TZ): Use 7 * configure.in (checking whether localtime caches TZ): Use
diff --git a/configure b/configure
index 3e3f91d4537..183b8d1f766 100755
--- a/configure
+++ b/configure
@@ -14986,7 +14986,7 @@ echo " Does Emacs use -lgpm? ${HAVE_GPM}"
14986echo " Does Emacs use -ldbus? ${HAVE_DBUS}" 14986echo " Does Emacs use -ldbus? ${HAVE_DBUS}"
14987echo " Does Emacs use -lgconf? ${HAVE_GCONF}" 14987echo " Does Emacs use -lgconf? ${HAVE_GCONF}"
14988echo " Does Emacs use -lselinux? ${HAVE_LIBSELINUX}" 14988echo " Does Emacs use -lselinux? ${HAVE_LIBSELINUX}"
14989echo " Does Emacs use -lgnutls? ${HAVE_GNUTLS}" 14989echo " Does Emacs use -lgnutls? ${HAVE_GNUTLS}"
14990echo " Does Emacs use -lxml2? ${HAVE_LIBXML2}" 14990echo " Does Emacs use -lxml2? ${HAVE_LIBXML2}"
14991 14991
14992echo " Does Emacs use -lfreetype? ${HAVE_FREETYPE}" 14992echo " Does Emacs use -lfreetype? ${HAVE_FREETYPE}"
diff --git a/configure.in b/configure.in
index d53830b5ba2..3126a376600 100644
--- a/configure.in
+++ b/configure.in
@@ -3704,7 +3704,7 @@ echo " Does Emacs use -lgpm? ${HAVE_GPM}"
3704echo " Does Emacs use -ldbus? ${HAVE_DBUS}" 3704echo " Does Emacs use -ldbus? ${HAVE_DBUS}"
3705echo " Does Emacs use -lgconf? ${HAVE_GCONF}" 3705echo " Does Emacs use -lgconf? ${HAVE_GCONF}"
3706echo " Does Emacs use -lselinux? ${HAVE_LIBSELINUX}" 3706echo " Does Emacs use -lselinux? ${HAVE_LIBSELINUX}"
3707echo " Does Emacs use -lgnutls? ${HAVE_GNUTLS}" 3707echo " Does Emacs use -lgnutls? ${HAVE_GNUTLS}"
3708echo " Does Emacs use -lxml2? ${HAVE_LIBXML2}" 3708echo " Does Emacs use -lxml2? ${HAVE_LIBXML2}"
3709 3709
3710echo " Does Emacs use -lfreetype? ${HAVE_FREETYPE}" 3710echo " Does Emacs use -lfreetype? ${HAVE_FREETYPE}"
diff --git a/src/config.in b/src/config.in
index add2ac73d55..5b042ce8eff 100644
--- a/src/config.in
+++ b/src/config.in
@@ -1059,6 +1059,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
1059/* Define to `int' if <sys/types.h> does not define. */ 1059/* Define to `int' if <sys/types.h> does not define. */
1060#undef pid_t 1060#undef pid_t
1061 1061
1062/* Define to `unsigned int' if <sys/types.h> does not define. */
1063#undef size_t
1064
1062/* Define to any substitute for sys_siglist. */ 1065/* Define to any substitute for sys_siglist. */
1063#undef sys_siglist 1066#undef sys_siglist
1064 1067
@@ -1097,17 +1100,14 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
1097#include config_opsysfile 1100#include config_opsysfile
1098#include config_machfile 1101#include config_machfile
1099 1102
1100/* Set up some defines, C and LD flags for NeXTstep interface on GNUstep.
1101 (There is probably a better place to do this, but right now the Cocoa
1102 side does this in s/darwin.h and we cannot
1103 parallel this exactly since GNUstep is multi-OS. */
1104#ifdef HAVE_NS
1105# ifdef NS_IMPL_GNUSTEP
1106/* GNUstep needs a bit more pure memory. Of the existing knobs, 1103/* GNUstep needs a bit more pure memory. Of the existing knobs,
1107SYSTEM_PURESIZE_EXTRA seems like the least likely to cause problems. */ 1104 SYSTEM_PURESIZE_EXTRA seems like the least likely to cause problems.
1105 (There is probably a better place to do this, but right now the
1106 Cocoa side does this in s/darwin.h and we cannot parallel this
1107 exactly since GNUstep is multi-OS. */
1108#if defined HAVE_NS && defined NS_IMPL_GNUSTEP
1108# define SYSTEM_PURESIZE_EXTRA 30000 1109# define SYSTEM_PURESIZE_EXTRA 30000
1109# endif /* NS_IMPL_GNUSTEP */ 1110#endif
1110#endif /* HAVE_NS */
1111 1111
1112/* SIGTYPE is the macro we actually use. */ 1112/* SIGTYPE is the macro we actually use. */
1113#ifndef SIGTYPE 1113#ifndef SIGTYPE