summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configure.in12
-rw-r--r--pgppubring.c6
2 files changed, 2 insertions, 16 deletions
diff --git a/configure.in b/configure.in
index d2368303..93fcde36 100644
--- a/configure.in
+++ b/configure.in
@@ -225,18 +225,6 @@ AC_REPLACE_FUNCS(strcasecmp)
AC_CHECK_FUNC(getopt)
if test $ac_cv_func_getopt = yes; then
AC_CHECK_HEADERS(getopt.h)
- if test $ac_cv_header_getopt_h = no; then
- AC_MSG_CHECKING(for getopt declaration in stdio.h)
- AC_EGREP_HEADER(getopt,stdio.h,dnl
- [ AC_DEFINE(HAVE_GETOPT_DECL)
- AC_MSG_RESULT(yes) ],dnl
- AC_MSG_RESULT(no)
- AC_MSG_CHECKING(for getopt declaration in stdlib.h)
- AC_EGREP_HEADER(getopt,stdlib.h,dnl
- [ AC_DEFINE(HAVE_GETOPT_DECL)
- AC_MSG_RESULT(yes) ],dnl
- AC_MSG_RESULT(no)))
- fi
fi
mutt_cv_snprintf=no
diff --git a/pgppubring.c b/pgppubring.c
index 04790f70..33bc8db4 100644
--- a/pgppubring.c
+++ b/pgppubring.c
@@ -44,12 +44,10 @@
#include <time.h>
#ifdef HAVE_GETOPT_H
# include <getopt.h>
-#else
-# ifndef HAVE_GETOPT_DECL
+#endif
+
extern char *optarg;
extern int optind;
-# endif
-#endif
#include "sha.h"
#include "lib.h"