From: Andre Noll <maan@tuebingen.mpg.de>
Date: Sun, 26 Jun 2016 10:37:42 +0000 (+0200)
Subject: Remove gengetopt and help2man checks from configure.ac.
X-Git-Tag: v0.6.0~2^2~16
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=9b45b4b85558f012621fc97af31cd2ad6ad08383;p=paraslash.git

Remove gengetopt and help2man checks from configure.ac.

The build system no longer depends on these tools, so the checks have
become unnecessary.
---

diff --git a/Makefile.in b/Makefile.in
index c283b035..2fee61cb 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -10,10 +10,6 @@ PACKAGE_VERSION := @PACKAGE_VERSION@
 
 INSTALL := @INSTALL@
 M4 := @M4@
-GENGETOPT := @GENGETOPT@
-HELP2MAN := @HELP2MAN@
-
-ggo_descriptions_declared := @ggo_descriptions_declared@
 
 executables := @executables@
 
diff --git a/configure.ac b/configure.ac
index 6a50eacd..54a313ad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,18 +51,10 @@ AC_DEFUN([LIB_SUBST_FLAGS], [
 AC_USE_SYSTEM_EXTENSIONS
 AC_C_BIGENDIAN()
 
-AC_PATH_PROG([GENGETOPT], [gengetopt])
-test -z "$GENGETOPT" && AC_MSG_ERROR(
-	[gengetopt is required to build this package])
-
 AC_PATH_PROG([M4], [m4])
 test -z "$M4" && AC_MSG_ERROR(
 	[The m4 macro processor is required to build this package])
 
-AC_PATH_PROG([HELP2MAN], [help2man])
-test -z "$HELP2MAN" && AC_MSG_ERROR(
-	[help2man is required to build this package])
-
 AC_PATH_PROG([INSTALL], [install])
 test -z "$INSTALL" && AC_MSG_ERROR(
 	[The install program is required to build this package])
@@ -202,15 +194,6 @@ AC_MSG_RESULT($have_ucred)
 if test ${have_ucred} = yes; then
 	AC_DEFINE(HAVE_UCRED, 1, define to 1 you have struct ucred)
 fi
-########################################################################### gengetopt
-echo 'option "z" z "" flag off' | $GENGETOPT --file-name conftest-ggo &&
-AC_CHECK_DECL(
-	[gengetopt_args_info_description],
-	[ggo_descriptions_declared=yes],
-	[ggo_descriptions_declared=no],
-	[#include "conftest-ggo.h"]
-)
-AC_SUBST(ggo_descriptions_declared)
 ########################################################################### curses
 STASH_FLAGS
 LIB_ARG_WITH([curses], [])