getopt: update client modules

* modules/argp (Depends-on): Use getopt-gnu.
* modules/git-merge-changelog (Depends-on): Likewise.
* modules/long-options (Depends-on): Likewise.
* modules/xstrtol (Depends-on): Likewise.

Signed-off-by: Eric Blake <ebb9@byu.net>

diff --git a/ChangeLog b/ChangeLog
index 5193899..8fe1403 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-08-13  Eric Blake  <ebb9@byu.net>
+
+       getopt: update client modules
+       * modules/argp (Depends-on): Use getopt-gnu.
+       * modules/git-merge-changelog (Depends-on): Likewise.
+       * modules/long-options (Depends-on): Likewise.
+       * modules/xstrtol (Depends-on): Likewise.
+
 2009-08-13  Simon Josefsson  <simon@josefsson.org>
 
        * tests/test-version-etc.sh: Don't fail on different

diff --git a/modules/argp b/modules/argp
index a32cae9..e772b3e 100644 (file)
--- a/modules/argp
+++ b/modules/argp
@@ -25,7 +25,7 @@ m4/argp.m4
 Depends-on:
 alloca
 dirname
-getopt
+getopt-gnu
 strchrnul
 sysexits
 malloc

diff --git a/modules/git-merge-changelog b/modules/git-merge-changelog
index e2b733e..732324e 100644 (file)
--- a/modules/git-merge-changelog
+++ b/modules/git-merge-changelog
@@ -5,7 +5,7 @@ Files:
 lib/git-merge-changelog.c
 
 Depends-on:
-getopt
+getopt-gnu
 stdbool
 progname
 error

diff --git a/modules/long-options b/modules/long-options
index 418edcc..29bf734 100644 (file)
--- a/modules/long-options
+++ b/modules/long-options
@@ -7,7 +7,7 @@ lib/long-options.c
 m4/long-options.m4
 
 Depends-on:
-getopt
+getopt-gnu
 version-etc
 
 configure.ac:

diff --git a/modules/xstrtol b/modules/xstrtol
index 540252a..3ce76a8 100644 (file)
--- a/modules/xstrtol
+++ b/modules/xstrtol
@@ -11,7 +11,7 @@ m4/xstrtol.m4
 Depends-on:
 exitfail
 error
-getopt
+getopt-gnu
 gettext-h
 intprops
 inttypes