--- oo_1.0_src/tools/bootstrp/addexes/makefile.mk.systemgo	Sun Jun  2 19:50:01 2002
+++ oo_1.0_src/tools/bootstrp/addexes/makefile.mk	Sun Jun  2 19:50:11 2002
@@ -98,7 +98,6 @@
 #APP3TARGET=	ldump
 APP3STACK=	16000
 APP3OBJS=   $(OBJ)$/ldump.obj $(OBJ)$/hashtbl.obj
-APP3STDLIBS=gnu_getopt.lib
 APP3DEPN=   $(OBJ)$/ldump.obj $(OBJ)$/hashtbl.obj
 
 #APP4TARGET=	readmap
--- oo_1.0_src/tools/bootstrp/cppdep.cxx.systemgo	Wed Jun 13 15:43:51 2001
+++ oo_1.0_src/tools/bootstrp/cppdep.cxx	Sun Jun  2 19:29:10 2002
@@ -64,18 +64,18 @@
  
 #ifdef WNT
 #ifdef BOOTSTRAPPER
-#include <glibc/posix/getopt.h>
+#include <getopt.h>
 #else
-#include <glibc/getopt.h>
+#include <getopt.h>
 #endif
 #endif
  
 #ifdef UNX
 #ifdef MACOSX
 #ifdef BOOTSTRAPPER
-#include <glibc/posix/getopt.h>
+#include <getopt.h>
 #else
-#include <glibc/getopt.h>
+#include <getopt.h>
 #endif
 #endif
 #include <unistd.h>
--- oo_1.0_src/external/glibc/sdfiles/makefile.mk.systemgo	Sun Jun  2 19:47:20 2002
+++ oo_1.0_src/external/glibc/sdfiles/makefile.mk	Sun Jun  2 19:48:16 2002
@@ -60,6 +60,13 @@
 #
 #*************************************************************************
 
+# We use glibc. There's no need to dupe its functionality, especially not
+# with legacy versions of known good code.
+
+all:
+	@echo ignoring gnu_getopt
+
+
 PRJ=..$/..
 
 PRJNAME=3rdparty
--- oo_1.0_src/external/glibc/makefile.mk.systemgo	Tue Nov 21 11:22:34 2000
+++ oo_1.0_src/external/glibc/makefile.mk	Sun Jun  2 19:29:10 2002
@@ -60,6 +60,11 @@
 #
 #*************************************************************************
 
+.IF "$(GUI)" == "UNX"
+all:
+	@echo "Assuming you already have glibc - no need to do anything."
+.ENDIF
+
 MAKEFILERC=yes
 
 .IF "$(OS)" == "WNT"
--- oo_1.0_src/external/prj/d.lst.systemgo	Sun Jun  2 19:48:45 2002
+++ oo_1.0_src/external/prj/d.lst	Sun Jun  2 19:49:02 2002
@@ -46,8 +46,6 @@
 
 ..\%__SRC%\slo\np* %_DEST%\lib%_EXT%\*
 ..\%__SRC%\slo\PluginNew.* %_DEST%\lib%_EXT%\*
-..\%__SRC%\slb\gnu_getopt.lib %_DEST%\lib%_EXT%\gnu_getopt.lib
-..\%__SRC%\lib\libgnu_getopt.a %_DEST%\lib%_EXT%\libgnu_getopt.a
 ..\%__SRC%\slb\zlib.lib %_DEST%\lib%_EXT%\zlib.lib
 ..\%__SRC%\lib\libzlib.a %_DEST%\lib%_EXT%\libzlib.a
 ..\%__SRC%\lib\libfreetype.a %_DEST%\lib%_EXT%\libfreetype.a