From 7ee825862056bc6303434203a32f7a936afd13d9 Mon Sep 17 00:00:00 2001
From: Christopher Faylor <me@cgf.cx>
Date: Thu, 20 Nov 2003 19:31:41 +0000
Subject: [PATCH] * configure.in: Make --use-server the default. Remove
powerpc target. * configure: Regenerate.
---
winsup/cygwin/ChangeLog | 5 +++++
winsup/cygwin/configure | 19 ++++++++-----------
winsup/cygwin/configure.in | 13 +++++--------
3 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index e070df011..2ea8ab4f4 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-20 Christopher Faylor <cgf@redhat.com>
+
+ * configure.in: Make --use-server the default. Remove powerpc target.
+ * configure: Regenerate.
+
2003-11-20 Corinna Vinschen <corinna@vinschen.de>
* msg.cc (msgctl): Raise SIGSYS if call not available.
diff --git a/winsup/cygwin/configure b/winsup/cygwin/configure
index eb1b6889a..08d253eb3 100755
--- a/winsup/cygwin/configure
+++ b/winsup/cygwin/configure
@@ -1900,22 +1900,23 @@ esac
fi
+LIBSERVER='$(bupdir)/cygserver/libcygserver.a'
# Check whether --enable-server or --disable-server was given.
if test "${enable_server+set}" = set; then
enableval="$enable_server"
case "${enableval}" in
-yes)
- cat >> confdefs.h <<\EOF
-#define USE_SERVER 1
-EOF
-
- LIBSERVER='$(bupdir)/cygserver/libcygserver.a' ;;
-no) LIBSERVER=;;
+yes) ;;
+no) LIBSERVER=;;
esac
fi
+test -n "$LIBSERVER" && cat >> confdefs.h <<\EOF
+#define USE_SERVER 1
+EOF
+
+
MALLOC_OFILES=malloc.o
# Check whether --enable-malloc-debugging or --disable-malloc-debugging was given.
if test "${enable_malloc_debugging+set}" = set; then
@@ -1956,10 +1957,6 @@ case "$target_cpu" in
DEF_DLL_ENTRY="dll_entry@12"
ALLOCA="_alloca"
CONFIG_DIR="i386" ;;
- powerpc*) DLL_ENTRY="dll_entry"
- DEF_DLL_ENTRY="dll_entry"
- ALLOCA=" __allocate_stack"
- CONFIG_DIR="ppc" ;;
*) { echo "configure: error: Invalid target processor \"$target_cpu\"" 1>&2; exit 1; } ;;
esac
diff --git a/winsup/cygwin/configure.in b/winsup/cygwin/configure.in
index d47b4084f..c560301b1 100644
--- a/winsup/cygwin/configure.in
+++ b/winsup/cygwin/configure.in
@@ -135,16 +135,17 @@ no) ;;
esac
])
+LIBSERVER='$(bupdir)/cygserver/libcygserver.a'
AC_ARG_ENABLE(server,
[ --enable-server Build a cygwin DLL which can communicate with cygserver],
[case "${enableval}" in
-yes)
- AC_DEFINE(USE_SERVER)
- LIBSERVER='$(bupdir)/cygserver/libcygserver.a' ;;
-no) LIBSERVER=;;
+yes) ;;
+no) LIBSERVER=;;
esac
])
+test -n "$LIBSERVER" && AC_DEFINE(USE_SERVER)
+
MALLOC_OFILES=malloc.o
AC_ARG_ENABLE(malloc-debugging,
[ --enable-malloc-debugging Build a cygwin DLL with heap sanity checking (this is very slow, use only if you have heap corruption problems)],
@@ -186,10 +187,6 @@ case "$target_cpu" in
DEF_DLL_ENTRY="dll_entry@12"
ALLOCA="_alloca"
CONFIG_DIR="i386" ;;
- powerpc*) DLL_ENTRY="dll_entry"
- DEF_DLL_ENTRY="dll_entry"
- ALLOCA=" __allocate_stack"
- CONFIG_DIR="ppc" ;;
*) AC_MSG_ERROR(Invalid target processor \"$target_cpu\") ;;
esac