* Makefile.in: Add define to CXXFLAGS.

8 files changed, 15 insertions, 12 deletions

diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog
index ff6f7a7d4..63d77c3a4 100644
--- a/winsup/utils/ChangeLog
+++ b/winsup/utils/ChangeLog
@@ -1,3 +1,7 @@
+2001-12-11  Christopher Faylor  <cgf@redhat.com>
+
+	* Makefile.in: Add define to CXXFLAGS.
+
 2001-12-03  Christopher Faylor  <cgf@redhat.com>
 
 	* cygcheck.cc (usage): Add -c description.
diff --git a/winsup/utils/Makefile.in b/winsup/utils/Makefile.in
index 4020707c2..629e23822 100644
--- a/winsup/utils/Makefile.in
+++ b/winsup/utils/Makefile.in
@@ -1,5 +1,5 @@
 # Makefile for Cygwin utilities
-# Copyright 1996, 1997, 1998, 1999, 2000 Cygnus Solutions.
+# Copyright 1996, 1997, 1998, 1999, 2000, 2001 Red Hat, Inc.
 
 # This file is part of Cygwin.
 
@@ -31,7 +31,7 @@ CXX:=@CXX@
 CXX_FOR_TARGET:=$(CXX)
 
 CFLAGS:=@CFLAGS@
-CXXFLAGS:=@CXXFLAGS@ -fno-exceptions -fno-rtti
+CXXFLAGS:=@CXXFLAGS@ -fno-exceptions -fno-rtti -DHAVE_DECL_GETOPT=0
 
 include $(srcdir)/../Makefile.common
 
diff --git a/winsup/utils/cygcheck.cc b/winsup/utils/cygcheck.cc
index 5bce951ec..ce9ad5313 100644
--- a/winsup/utils/cygcheck.cc
+++ b/winsup/utils/cygcheck.cc
@@ -759,7 +759,7 @@ dump_sysinfo ()
   time_t now;
   char *found_cygwin_dll;
 
-  printf ("\nCygnus Win95/NT Configuration Diagnostics\n");
+  printf ("\nCygwin Win95/NT Configuration Diagnostics\n");
   time (&now);
   printf ("Current System Time: %s\n", ctime (&now));
 
diff --git a/winsup/utils/cygpath.cc b/winsup/utils/cygpath.cc
index 9f066eb59..bac8b42db 100644
--- a/winsup/utils/cygpath.cc
+++ b/winsup/utils/cygpath.cc
@@ -1,6 +1,5 @@
-/* pathconv.cc -- convert pathnames between Windows and Unix format
-   Copyright 1998, 1999, 2000 Cygnus Solutions.
-   Written by Ian Lance Taylor <ian@cygnus.com>.
+/* cygpath.cc -- convert pathnames between Windows and Unix format
+   Copyright 1998, 1999, 2000, 2001 Red Hat, Inc.
 
 This file is part of Cygwin.
 
@@ -294,8 +293,8 @@ main (int argc, char **argv)
 	  break;
 
 	case 'v':
-	  printf ("Cygwin pathconv version 1.0\n");
-	  printf ("Copyright 1998,1999,2000 Cygnus Solutions\n");
+	  printf ("Cygwin path conversion version 1.1\n");
+	  printf ("Copyright 1998,1999,2000,2001 Red Hat, Inc.\n");
 	  exit (0);
 
 	default:
diff --git a/winsup/utils/module_info.cc b/winsup/utils/module_info.cc
index 249f089d6..c0e7079cc 100644
--- a/winsup/utils/module_info.cc
+++ b/winsup/utils/module_info.cc
@@ -1,6 +1,6 @@
 /* module_info.cc
 
-   Copyright 1999 Cygnus Solutions.
+   Copyright 1999,2000,2001 Red Hat, Inc.
 
    Written by Egor Duda <deo@logos-m.ru>
 
diff --git a/winsup/utils/parse_pe.cc b/winsup/utils/parse_pe.cc
index 7e2a83731..07242da87 100644
--- a/winsup/utils/parse_pe.cc
+++ b/winsup/utils/parse_pe.cc
@@ -1,6 +1,6 @@
 /* parse_pe.cc
 
-   Copyright 1999 Cygnus Solutions.
+   Copyright 1999,2000,2001 Red Hat, Inc.
 
    Written by Egor Duda <deo@logos-m.ru>
 
diff --git a/winsup/utils/ps.cc b/winsup/utils/ps.cc
index 796d9f069..c32110b43 100644
--- a/winsup/utils/ps.cc
+++ b/winsup/utils/ps.cc
@@ -1,6 +1,6 @@
 /* ps.cc
 
-   Copyright 1996, 1997, 1998, 1999, 2000 Cygnus Solutions.
+   Copyright 1996, 1997, 1998, 1999, 2000, 2001 Red Hat, Inc.
 
 This file is part of Cygwin.
 
diff --git a/winsup/utils/umount.cc b/winsup/utils/umount.cc
index c19b78cdc..cff08c70a 100644
--- a/winsup/utils/umount.cc
+++ b/winsup/utils/umount.cc
@@ -1,6 +1,6 @@
 /* umount.cc
 
-   Copyright 1996, 1998, 1999 Cygnus Solutions.
+   Copyright 1996, 1998, 1999, 2000, 2001 Red Hat, Inc.
 
 This file is part of Cygwin.