summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNIIBE Yutaka <gniibe@fsij.org>2021-08-05 07:01:14 +0200
committerNIIBE Yutaka <gniibe@fsij.org>2021-08-05 07:01:14 +0200
commit29d58e9de7838bcf32e358602abd4ed4498566f8 (patch)
tree4a9334b5cdd43535e86c3039c159c05b1655789d
parentsm: Fix pwri. (diff)
downloadgnupg2-29d58e9de7838bcf32e358602abd4ed4498566f8.tar.xz
gnupg2-29d58e9de7838bcf32e358602abd4ed4498566f8.zip
build: Simplify for string.h and getopt.h.
* configure.ac (AC_CHECK_HEADERS): Remove string.h and getopt.h. * dirmngr/ks-engine-ldap.c: Remove including getopt.h. * tools/make-dns-cert.c: Likewise. -- Checking string.h is supported by AC_HEADER_STDC. Use of getopt.h is only needed for getopt_long of GNU extention. Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
-rw-r--r--configure.ac2
-rw-r--r--dirmngr/ks-engine-ldap.c3
-rw-r--r--tools/make-dns-cert.c3
3 files changed, 1 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac
index 361a5d80d..913aeb4e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1358,7 +1358,7 @@ fi
AC_MSG_NOTICE([checking for header files])
AC_HEADER_STDC
AC_HEADER_TIME
-AC_CHECK_HEADERS([string.h unistd.h langinfo.h termio.h locale.h getopt.h \
+AC_CHECK_HEADERS([unistd.h langinfo.h termio.h locale.h \
pwd.h inttypes.h signal.h sys/select.h \
stdint.h signal.h termios.h \
ucred.h sys/ucred.h sys/sysmacros.h sys/mkdev.h])
diff --git a/dirmngr/ks-engine-ldap.c b/dirmngr/ks-engine-ldap.c
index 25f03c3f6..e0f8e6f7c 100644
--- a/dirmngr/ks-engine-ldap.c
+++ b/dirmngr/ks-engine-ldap.c
@@ -24,9 +24,6 @@
#include <string.h>
#include <time.h>
#include <unistd.h>
-#ifdef HAVE_GETOPT_H
-# include <getopt.h>
-#endif
#include <stdlib.h>
#include <npth.h>
diff --git a/tools/make-dns-cert.c b/tools/make-dns-cert.c
index 9a7e20d10..865364cb8 100644
--- a/tools/make-dns-cert.c
+++ b/tools/make-dns-cert.c
@@ -22,9 +22,6 @@
#endif
#include <unistd.h>
-#ifdef HAVE_GETOPT_H
-#include <getopt.h>
-#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>