Include gnome-argp.h. Include gnome-argp.h.

Wed Mar  4 00:58:27 1998  Tom Tromey  <tromey@cygnus.com>

	* argp-parse.c: Include gnome-argp.h.
	* argp-help.c: Include gnome-argp.h.

	* README-gnome, gnome-argp.h: New files.

	* argp-ba.c, argp-eexst.c, argp-fmtstream.c, argp-fmtstream.h,
	argp-fs-xinl.c, argp-help.c, argp-namefrob.h, argp-parse.c,
	argp-pv.c, argp-pvh.c, argp-test.c, argp-xinl.c, argp.h,
	strndup.c: New files, imported from glibc.  Please use "cvs
	import" if you import new versions.

	* Makefile.am (noinst_HEADERS): Added argp-fmtstream.h,
	argp-namefrob.h, argp.h, gnome-argp.h.
	(EXTRA_DIST): New macro.

svn path=/trunk/; revision=104

6 files changed, 67 insertions, 3 deletions

diff --git a/support/ChangeLog b/support/ChangeLog
index ea8dc74..de05350 100644
--- a/support/ChangeLog
+++ b/support/ChangeLog
@@ -1,3 +1,20 @@
+Wed Mar  4 00:58:27 1998  Tom Tromey  <tromey@cygnus.com>
+
+	* argp-parse.c: Include gnome-argp.h.
+	* argp-help.c: Include gnome-argp.h.
+
+	* README-gnome, gnome-argp.h: New files.
+
+	* argp-ba.c, argp-eexst.c, argp-fmtstream.c, argp-fmtstream.h,
+	argp-fs-xinl.c, argp-help.c, argp-namefrob.h, argp-parse.c,
+	argp-pv.c, argp-pvh.c, argp-test.c, argp-xinl.c, argp.h,
+	strndup.c: New files, imported from glibc.  Please use "cvs
+	import" if you import new versions.
+
+	* Makefile.am (noinst_HEADERS): Added argp-fmtstream.h,
+	argp-namefrob.h, argp.h, gnome-argp.h.
+	(EXTRA_DIST): New macro.
+
 1998-02-18  Raja R Harinath  <harinath@cs.umn.edu>
 
 	* strcasecmp.c: New file, copied from `glibc'.  Used to provide
diff --git a/support/Makefile.am b/support/Makefile.am
index fb3ca87..f4e5564 100644
--- a/support/Makefile.am
+++ b/support/Makefile.am
@@ -1,6 +1,11 @@
+## Process this file with automake to produce Makefile.in.
+
 noinst_LIBRARIES=libsupport.a
 
-noinst_HEADERS=getopt.h long-options.h
+noinst_HEADERS=getopt.h long-options.h argp-fmtstream.h	\
+		argp-namefrob.h argp.h
+
+EXTRA_DIST = argp-test.c
 
 libsupport_a_SOURCES=long-options.c
 libsupport_a_LIBADD=@LIBOBJS@
diff --git a/support/README-gnome b/support/README-gnome
new file mode 100644
index 0000000..7ada2e4
--- /dev/null
+++ b/support/README-gnome
@@ -0,0 +1,15 @@
+Note to Gnome hackers:
+
+Some files in this directory are taken verbatim from glibc.
+Do not modify them.  If you find a bug, report it as you would any
+glibc bug.
+
+When updating the glibc files in the master Gnome repository, be sure
+to use "cvs import".  That will ensure that any local changes are
+merged in.
+
+Yes, there are some minor local changes.  Hopefully these will be
+sorted out with the glibc maintainer before long.
+
+- Tom Tromey <tromey@cygnus.com>
+  Wed, Mar 4 1998
diff --git a/support/argp-help.c b/support/argp-help.c
index 8faacd5..334cab0 100644
--- a/support/argp-help.c
+++ b/support/argp-help.c
@@ -1,5 +1,5 @@
 /* Hierarchial argument parsing help output
-   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Written by Miles Bader <miles@gnu.ai.mit.edu>.
 
@@ -45,6 +45,10 @@
 #include "argp.h"
 #include "argp-fmtstream.h"
 #include "argp-namefrob.h"
+
+/* This is for Gnome only.  */
+#include "gnome-argp.h"
+
 
 /* User-selectable (using an environment variable) formatting parameters.
 
diff --git a/support/argp-parse.c b/support/argp-parse.c
index 553dd88..f13adb9 100644
--- a/support/argp-parse.c
+++ b/support/argp-parse.c
@@ -1,5 +1,5 @@
 /* Hierarchial argument parsing, layered over getopt
-   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Written by Miles Bader <miles@gnu.ai.mit.edu>.
 
@@ -52,6 +52,9 @@
 #include "argp.h"
 #include "argp-namefrob.h"
 
+/* This is for Gnome only.  */
+#include "gnome-argp.h"
+
 /* Getopt return values.  */
 #define KEY_END (-1)		/* The end of the options.  */
 #define KEY_ARG 1		/* A non-option argument.  */
diff --git a/support/gnome-argp.h b/support/gnome-argp.h
new file mode 100644
index 0000000..e95997d
--- /dev/null
+++ b/support/gnome-argp.h
@@ -0,0 +1,20 @@
+/* Gnome-specific code to help with argp integration.
+   Written by Tom Tromey <tromey@cygnus.com>.  */
+
+#ifndef __GNOME_ARGP_H__
+#define __GNOME_ARGP_H__
+
+#ifndef HAVE_STRNDUP
+/* Like strdup, but only copy N chars.  */
+extern char *strndup (const char *s, size_t n);
+#endif
+
+#ifndef HAVE_PROGRAM_INVOCATION_SHORT_NAME
+extern char *program_invocation_short_name;
+#endif
+
+#ifndef HAVE_PROGRAM_INVOCATION_NAME
+extern char *program_invocation_name;
+#endif
+
+#endif /* __GNOME_ARGP_H__ */