Add a check for <unistd.h> providing a prototype for getopt() which is compatible

with the one in include/getopt.h.  If so then define HAVE_DECL_GETOPT.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 4e48da1c0a1163bcc73f83d830549816dd68ce9d..46cdf48e9bbd614d31f6ebf8c3a00aa98ad873fd 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,11 @@
+2005-04-01  Nick Clifton  <nickc@redhat.com>
+
+       * configure.in: Add a check for <unistd.h> providing a prototype
+       for getopt() which is compatible with the one in
+       include/getopt.h.  If so then define HAVE_DECL_GETOPT.
+       * configure: Regenerate.
+       * config.in (HAVE_DECL_GETOPT): Add.
+
 2005-04-01  Jan Beulich  <jbeulich@novell.com>
 
        * config/tc-i386.c (s_bss): Call obj_elf_section_change_hook.

diff --git a/gas/config.in b/gas/config.in
index 6b5b8dce22ac688e15619cc31650a8fbfb649863..9c91b88281b08fdd81c5d1196302e7bf4671dc78 100644 (file)
--- a/gas/config.in
+++ b/gas/config.in
@@ -318,3 +318,6 @@
 
 /* Define to `unsigned' if <sys/types.h> does not define. */
 #undef size_t
+
+/* Is the prototype for getopt in <unistd.h> in the expected format?  */
+#undef HAVE_DECL_GETOPT

diff --git a/gas/configure b/gas/configure
index 62c3df725f902358092121394c71f4407288c590..00f9bcb052021bd916ac8af7aca2f78e284d4fd6 100755 (executable)
--- a/gas/configure
+++ b/gas/configure
@@ -10518,6 +10518,68 @@ _ACEOF
 fi
 
 
+echo "$as_me:$LINENO: checking for a known getopt prototype in unistd.h" >&5
+echo $ECHO_N "checking for a known getopt prototype in unistd.h... $ECHO_C" >&6
+if test "${gas_cv_decl_getopt_unistd_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <unistd.h>
+int
+main ()
+{
+extern int getopt (int, char *const*, const char *);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  gas_cv_decl_getopt_unistd_h=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+gas_cv_decl_getopt_unistd_h=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+echo "$as_me:$LINENO: result: $gas_cv_decl_getopt_unistd_h" >&5
+echo "${ECHO_T}$gas_cv_decl_getopt_unistd_h" >&6
+if test $gas_cv_decl_getopt_unistd_h = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_DECL_GETOPT 1
+_ACEOF
+
+fi
+
 
 echo "$as_me:$LINENO: checking whether declaration is required for environ" >&5
 echo $ECHO_N "checking whether declaration is required for environ... $ECHO_C" >&6

diff --git a/gas/configure.in b/gas/configure.in
index 790a8f2b266ad7caaeb305622681e9f0f55c5896..1f77be3e5392a74af219df439a7be0af56ff8d6b 100644 (file)
--- a/gas/configure.in
+++ b/gas/configure.in
@@ -716,6 +716,16 @@ GAS_CHECK_DECL_NEEDED(errno, f, int f, [
 #endif
 ])
 
+AC_MSG_CHECKING(for a known getopt prototype in unistd.h)
+AC_CACHE_VAL(gas_cv_decl_getopt_unistd_h,
+[AC_TRY_COMPILE([#include <unistd.h>], [extern int getopt (int, char *const*, const char *);],
+gas_cv_decl_getopt_unistd_h=yes, gas_cv_decl_getopt_unistd_h=no)])
+AC_MSG_RESULT($gas_cv_decl_getopt_unistd_h)
+if test $gas_cv_decl_getopt_unistd_h = yes; then
+  AC_DEFINE([HAVE_DECL_GETOPT], 1,
+           [Is the prototype for getopt in <unistd.h> in the expected format?])
+fi
+
 GAS_CHECK_DECL_NEEDED(environ, f, char **f, $gas_test_headers)
 GAS_CHECK_DECL_NEEDED(ffs, f, int (*f)(int), $gas_test_headers)
 GAS_CHECK_DECL_NEEDED(free, f, void (*f)(), $gas_test_headers)