From 5691e8cfeba2ba5822a4cded2905c265795fac6e Mon Sep 17 00:00:00 2001
From: fedor <fedor@72102866-910b-0410-8b05-ffd578937521>
Date: Thu, 20 Aug 1998 17:48:46 +0000
Subject: [PATCH] configure and library-combo fixes.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@2938 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog                         |  5 +++++
 Headers/gnustep/base/Foundation.h |  1 +
 Source/GNUmakefile                |  1 -
 Source/Makefile.postamble         |  3 ++-
 Source/mframe.m                   | 13 +++++++++----
 5 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c988f2e7d..787649e12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Aug 20 11:50:23 1998  Adam Fedor  <fedor@doc.com>
+
+	* src/mframe.m (mframe_next_arg): Fixes from Richard
+	Frith-Macdonald <richard@brainstorm.co.uk>. 
+
 Tud Aug 13 21:15:00 1998  Richard Frith-Macdonald <richard@brainstorm.co.uk>
 
 	Rewrite of maframe stuff and associated things to get DO and
diff --git a/Headers/gnustep/base/Foundation.h b/Headers/gnustep/base/Foundation.h
index 161f1df2a..b94c9bd79 100644
--- a/Headers/gnustep/base/Foundation.h
+++ b/Headers/gnustep/base/Foundation.h
@@ -36,6 +36,7 @@
 #include <Foundation/NSCoder.h>
 #include <Foundation/NSDate.h>
 #include <Foundation/NSData.h>
+#include <Foundation/NSDebug.h>
 #include <Foundation/NSDictionary.h>
 #include <Foundation/NSException.h>
 #include <Foundation/NSFileManager.h>
diff --git a/Source/GNUmakefile b/Source/GNUmakefile
index 517238d23..982ae0936 100644
--- a/Source/GNUmakefile
+++ b/Source/GNUmakefile
@@ -111,7 +111,6 @@ TextCStream.m \
 UdpPort.m \
 Unicode.m \
 UnixFileHandle.m \
-$(GNU_EXTRAS_MFILES) \
 behavior.m \
 lex.pl.m \
 lex.sf.m \
diff --git a/Source/Makefile.postamble b/Source/Makefile.postamble
index a7ecd6bec..8be26f7bf 100644
--- a/Source/Makefile.postamble
+++ b/Source/Makefile.postamble
@@ -75,8 +75,9 @@ after-uninstall::
 # Things to do after distcleaning
 after-distclean::
 	rm -f include/config.h include/dynamic-load.h \
-		Foundation gnustep/base gnustep \
+		Foundation gnustep/base \
 		NSNumber[0-9]*.m NSValue[0-9]*.m
+	rmdir gnustep
 
 # Things to do before checking
 # before-check::
diff --git a/Source/mframe.m b/Source/mframe.m
index e8fba120a..8f7d4119e 100644
--- a/Source/mframe.m
+++ b/Source/mframe.m
@@ -286,9 +286,14 @@ mframe_next_arg(const char *typePtr, NSArgumentInfo *info)
 	case _C_PTR:
 	    info->size = sizeof(char*);
 	    info->align = __alignof__(char*);
-	    typePtr = mframe_next_arg(typePtr, &local);
-	    info->isReg = local.isReg;
-	    info->offset = local.offset;
+	    if (*typePtr == '?') {
+	      typePtr++;
+	    }
+	    else {
+	      typePtr = mframe_next_arg(typePtr, &local);
+	      info->isReg = local.isReg;
+	      info->offset = local.offset;
+	    }
 	    break;
 
 	case _C_ATOM:
@@ -399,7 +404,7 @@ mframe_next_arg(const char *typePtr, NSArgumentInfo *info)
      *	(and skipped past) the argframe offset information - so we
      *	don't need to (and can't) do it here.
      */
-    if (*info->type != _C_PTR) {
+    if (info->type[0] != _C_PTR || info->type[1] == '?') {
 	/*
 	 *	May tell the caller if the item is stored in a register.
 	 */