merge from gcc

libiberty/ChangeLog

-2005-07-22  Ben Elliston  <bje@gnu.org>
-
-	* configure.ac: Check for a getopt(3) declaration.
-	* configure, config.in: Regenerate.
-
 2005-07-15  Ben Elliston  <bje@au.ibm.com>
 
 	* regex.c (TRANSLATE): Cast rhs of ternary expression to char.

libiberty/config.in

@@ -56,10 +56,6 @@
    */
 #undef HAVE_DECL_GETENV
 
-/* Define to 1 if you have the declaration of `getopt', and to 0 if you don't.
-   */
-#undef HAVE_DECL_GETOPT
-
 /* Define to 1 if you have the declaration of `malloc', and to 0 if you don't.
    */
 #undef HAVE_DECL_MALLOC

libiberty/configure.ac

@@ -588,7 +588,7 @@ if test -z "${setobjs}"; then
 
   AC_CHECK_FUNCS($checkfuncs)
   AC_CHECK_DECLS([basename, ffs, asprintf, vasprintf, snprintf, vsnprintf])
-  AC_CHECK_DECLS([calloc, getenv, getopt, malloc, realloc, sbrk])
+  AC_CHECK_DECLS([calloc, getenv, malloc, realloc, sbrk])
   AC_CHECK_DECLS([strverscmp])
   libiberty_NEED_DECLARATION(canonicalize_file_name)
 fi