25 files changed, 6 insertions, 45 deletions
diff --git a/Makefile.in b/Makefile.in
index fb54e1ecc..b5c33253b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -282,7 +282,6 @@ GMP_LDFLAGS = @GMP_LDFLAGS@
 GMP_NAIL_BITS = @GMP_NAIL_BITS@
 HAVE_CLOCK_01 = @HAVE_CLOCK_01@
 HAVE_CPUTIME_01 = @HAVE_CPUTIME_01@
-HAVE_DECL_OPTARG = @HAVE_DECL_OPTARG@
 HAVE_GETRUSAGE_01 = @HAVE_GETRUSAGE_01@
 HAVE_GETTIMEOFDAY_01 = @HAVE_GETTIMEOFDAY_01@
 HAVE_HOST_CPU_FAMILY_power = @HAVE_HOST_CPU_FAMILY_power@
@@ -1021,7 +1020,7 @@ distclean-tags:
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
 	mkdir $(distdir)
-	$(mkdir_p) $(distdir)/. $(distdir)/demos $(distdir)/demos/calc $(distdir)/demos/expr
+	$(mkdir_p) $(distdir)/. $(distdir)/demos $(distdir)/demos/calc
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
diff --git a/configure b/configure
index a1c820e03..fa8459ee0 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.631 .
+# From configure.in Revision: 1.632 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59 for GNU MP 4.1.
 #
@@ -489,7 +489,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT WANT_MPBSD_TRUE WANT_MPBSD_FALSE GMP_NAIL_BITS ABI HAVE_HOST_CPU_FAMILY_power HAVE_HOST_CPU_FAMILY_powerpc GMP_LDFLAGS LIBGMP_LDFLAGS LIBGMPXX_LDFLAGS SPEED_CYCLECOUNTER_OBJ CALLING_CONVENTIONS_OBJS DEFN_LONG_LONG_LIMB CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP CC_FOR_BUILD CPP_FOR_BUILD EXEEXT_FOR_BUILD U_FOR_BUILD LIBM_FOR_BUILD CCAS CXX CXXFLAGS ac_ct_CXX WANT_CXX_TRUE WANT_CXX_FALSE CXXCPP EGREP U ANSI2KNR AR ac_ct_AR LIBGMP_DLL LN_S ECHO RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP LIBTOOL ENABLE_STATIC_TRUE ENABLE_STATIC_FALSE LIBM TAL_OBJECT M4 BITS_PER_MP_LIMB mpn_objs_in_libmp mpn_objects mpn_objs_in_libgmp gmp_srclinks TUNE_SQR_OBJ HAVE_CLOCK_01 HAVE_CPUTIME_01 HAVE_GETRUSAGE_01 HAVE_GETTIMEOFDAY_01 HAVE_SIGACTION_01 HAVE_SIGALTSTACK_01 HAVE_SIGSTACK_01 HAVE_SYS_RESOURCE_H_01 HAVE_STACK_T_01 LIBCURSES WITH_READLINE_01 LIBREADLINE YACC LEX LEXLIB LEX_OUTPUT_ROOT HAVE_DECL_OPTARG LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT WANT_MPBSD_TRUE WANT_MPBSD_FALSE GMP_NAIL_BITS ABI HAVE_HOST_CPU_FAMILY_power HAVE_HOST_CPU_FAMILY_powerpc GMP_LDFLAGS LIBGMP_LDFLAGS LIBGMPXX_LDFLAGS SPEED_CYCLECOUNTER_OBJ CALLING_CONVENTIONS_OBJS DEFN_LONG_LONG_LIMB CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP CC_FOR_BUILD CPP_FOR_BUILD EXEEXT_FOR_BUILD U_FOR_BUILD LIBM_FOR_BUILD CCAS CXX CXXFLAGS ac_ct_CXX WANT_CXX_TRUE WANT_CXX_FALSE CXXCPP EGREP U ANSI2KNR AR ac_ct_AR LIBGMP_DLL LN_S ECHO RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP LIBTOOL ENABLE_STATIC_TRUE ENABLE_STATIC_FALSE LIBM TAL_OBJECT M4 BITS_PER_MP_LIMB mpn_objs_in_libmp mpn_objects mpn_objs_in_libgmp gmp_srclinks TUNE_SQR_OBJ HAVE_CLOCK_01 HAVE_CPUTIME_01 HAVE_GETRUSAGE_01 HAVE_GETTIMEOFDAY_01 HAVE_SIGACTION_01 HAVE_SIGALTSTACK_01 HAVE_SIGSTACK_01 HAVE_SYS_RESOURCE_H_01 HAVE_STACK_T_01 LIBCURSES WITH_READLINE_01 LIBREADLINE YACC LEX LEXLIB LEX_OUTPUT_ROOT LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -31835,7 +31835,7 @@ fi
 # AC_SUBST+AC_CONFIG_FILES is used for calc-config.h, rather than AC_DEFINE+
 # AC_CONFIG_HEADERS, since with the latter automake (1.8) will then put the
 # directory (ie. demos/calc) into $(DEFAULT_INCLUDES) for every Makefile.in,
-# which would look very strange.  Likewise expr-config.h below.
+# which would look very strange.
 #
 # -lcurses is required by libreadline.  On a typical SVR4 style system this
 # normally doesn't have to be given explicitly, since libreadline.so will
@@ -32677,16 +32677,6 @@ if test "$LEX" = :; then
   LEX=${am_missing_run}flex
 fi
 
-# Configs for demos/expr directory
-          ac_config_files="$ac_config_files demos/expr/expr-config.h:demos/expr/expr-config-h.in"
-
-if test $ac_cv_have_decl_optarg = yes; then
-  HAVE_DECL_OPTARG=1
-
-else
-  HAVE_DECL_OPTARG=0
-fi
-
 
 # Create config.m4.
 
@@ -33276,7 +33266,6 @@ do
   # Handling of arguments.
   "demos/pexpr-config.h" ) CONFIG_FILES="$CONFIG_FILES demos/pexpr-config.h:demos/pexpr-config-h.in" ;;
   "demos/calc/calc-config.h" ) CONFIG_FILES="$CONFIG_FILES demos/calc/calc-config.h:demos/calc/calc-config-h.in" ;;
-  "demos/expr/expr-config.h" ) CONFIG_FILES="$CONFIG_FILES demos/expr/expr-config.h:demos/expr/expr-config-h.in" ;;
   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
   "mpbsd/Makefile" ) CONFIG_FILES="$CONFIG_FILES mpbsd/Makefile" ;;
   "mpf/Makefile" ) CONFIG_FILES="$CONFIG_FILES mpf/Makefile" ;;
@@ -33498,7 +33487,6 @@ s,@YACC@,$YACC,;t t
 s,@LEX@,$LEX,;t t
 s,@LEXLIB@,$LEXLIB,;t t
 s,@LEX_OUTPUT_ROOT@,$LEX_OUTPUT_ROOT,;t t
-s,@HAVE_DECL_OPTARG@,$HAVE_DECL_OPTARG,;t t
 s,@LIBOBJS@,$LIBOBJS,;t t
 s,@LTLIBOBJS@,$LTLIBOBJS,;t t
 CEOF
diff --git a/cxx/Makefile.in b/cxx/Makefile.in
index f4c152b5d..c60a5ba08 100644
--- a/cxx/Makefile.in
+++ b/cxx/Makefile.in
@@ -126,7 +126,6 @@ GMP_LDFLAGS = @GMP_LDFLAGS@
 GMP_NAIL_BITS = @GMP_NAIL_BITS@
 HAVE_CLOCK_01 = @HAVE_CLOCK_01@
 HAVE_CPUTIME_01 = @HAVE_CPUTIME_01@
-HAVE_DECL_OPTARG = @HAVE_DECL_OPTARG@
 HAVE_GETRUSAGE_01 = @HAVE_GETRUSAGE_01@
 HAVE_GETTIMEOFDAY_01 = @HAVE_GETTIMEOFDAY_01@
 HAVE_HOST_CPU_FAMILY_power = @HAVE_HOST_CPU_FAMILY_power@
diff --git a/demos/Makefile.in b/demos/Makefile.in
index 03e4639a5..24fe67b78 100644
--- a/demos/Makefile.in
+++ b/demos/Makefile.in
@@ -150,7 +150,6 @@ GMP_LDFLAGS = @GMP_LDFLAGS@
 GMP_NAIL_BITS = @GMP_NAIL_BITS@
 HAVE_CLOCK_01 = @HAVE_CLOCK_01@
 HAVE_CPUTIME_01 = @HAVE_CPUTIME_01@
-HAVE_DECL_OPTARG = @HAVE_DECL_OPTARG@
 HAVE_GETRUSAGE_01 = @HAVE_GETRUSAGE_01@
 HAVE_GETTIMEOFDAY_01 = @HAVE_GETTIMEOFDAY_01@
 HAVE_HOST_CPU_FAMILY_power = @HAVE_HOST_CPU_FAMILY_power@
diff --git a/demos/calc/Makefile.in b/demos/calc/Makefile.in
index 0310b6efc..508dc2a25 100644
--- a/demos/calc/Makefile.in
+++ b/demos/calc/Makefile.in
@@ -134,7 +134,6 @@ GMP_LDFLAGS = @GMP_LDFLAGS@
 GMP_NAIL_BITS = @GMP_NAIL_BITS@
 HAVE_CLOCK_01 = @HAVE_CLOCK_01@
 HAVE_CPUTIME_01 = @HAVE_CPUTIME_01@
-HAVE_DECL_OPTARG = @HAVE_DECL_OPTARG@
 HAVE_GETRUSAGE_01 = @HAVE_GETRUSAGE_01@
 HAVE_GETTIMEOFDAY_01 = @HAVE_GETTIMEOFDAY_01@
 HAVE_HOST_CPU_FAMILY_power = @HAVE_HOST_CPU_FAMILY_power@
diff --git a/demos/expr/Makefile.in b/demos/expr/Makefile.in
index 67c08280f..1efef2884 100644
--- a/demos/expr/Makefile.in
+++ b/demos/expr/Makefile.in
@@ -58,8 +58,7 @@ host_triplet = @host@
 ANSI2KNR = $(top_builddir)/ansi2knr
 EXTRA_PROGRAMS = run-expr$(EXEEXT) t-expr$(EXEEXT)
 subdir = demos/expr
-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/expr-config-h.in
+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.in
@@ -67,7 +66,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(mkdir_p)
 CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES = expr-config.h
+CONFIG_CLEAN_FILES =
 libexpr_a_AR = $(AR) $(ARFLAGS)
 libexpr_a_LIBADD =
 am_libexpr_a_OBJECTS = expr$U.$(OBJEXT) exprv$U.$(OBJEXT) \
@@ -137,7 +136,6 @@ GMP_LDFLAGS = @GMP_LDFLAGS@
 GMP_NAIL_BITS = @GMP_NAIL_BITS@
 HAVE_CLOCK_01 = @HAVE_CLOCK_01@
 HAVE_CPUTIME_01 = @HAVE_CPUTIME_01@
-HAVE_DECL_OPTARG = @HAVE_DECL_OPTARG@
 HAVE_GETRUSAGE_01 = @HAVE_GETRUSAGE_01@
 HAVE_GETTIMEOFDAY_01 = @HAVE_GETTIMEOFDAY_01@
 HAVE_HOST_CPU_FAMILY_power = @HAVE_HOST_CPU_FAMILY_power@
@@ -279,8 +277,6 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-expr-config.h: $(top_builddir)/config.status $(srcdir)/expr-config-h.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 libexpr.a: $(libexpr_a_OBJECTS) $(libexpr_a_DEPENDENCIES) 
 	-rm -f libexpr.a
 	$(libexpr_a_AR) libexpr.a $(libexpr_a_OBJECTS) $(libexpr_a_LIBADD)
diff --git a/doc/Makefile.in b/doc/Makefile.in
index e8caeec31..069c00363 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -121,7 +121,6 @@ GMP_LDFLAGS = @GMP_LDFLAGS@
 GMP_NAIL_BITS = @GMP_NAIL_BITS@
 HAVE_CLOCK_01 = @HAVE_CLOCK_01@
 HAVE_CPUTIME_01 = @HAVE_CPUTIME_01@
-HAVE_DECL_OPTARG = @HAVE_DECL_OPTARG@
 HAVE_GETRUSAGE_01 = @HAVE_GETRUSAGE_01@
 HAVE_GETTIMEOFDAY_01 = @HAVE_GETTIMEOFDAY_01@
 HAVE_HOST_CPU_FAMILY_power = @HAVE_HOST_CPU_FAMILY_power@
diff --git a/mpbsd/Makefile.in b/mpbsd/Makefile.in
index 77bcce6f3..7b66ae27e 100644
--- a/mpbsd/Makefile.in
+++ b/mpbsd/Makefile.in
@@ -128,7 +128,6 @@ GMP_LDFLAGS = @GMP_LDFLAGS@
 GMP_NAIL_BITS = @GMP_NAIL_BITS@
 HAVE_CLOCK_01 = @HAVE_CLOCK_01@
 HAVE_CPUTIME_01 = @HAVE_CPUTIME_01@
-HAVE_DECL_OPTARG = @HAVE_DECL_OPTARG@
 HAVE_GETRUSAGE_01 = @HAVE_GETRUSAGE_01@
 HAVE_GETTIMEOFDAY_01 = @HAVE_GETTIMEOFDAY_01@
 HAVE_HOST_CPU_FAMILY_power = @HAVE_HOST_CPU_FAMILY_power@
diff --git a/mpf/Makefile.in b/mpf/Makefile.in
index 0b652b396..6583cafca 100644
--- a/mpf/Makefile.in
+++ b/mpf/Makefile.in
@@ -139,7 +139,6 @@ GMP_LDFLAGS = @GMP_LDFLAGS@
 GMP_NAIL_BITS = @GMP_NAIL_BITS@
 HAVE_CLOCK_01 = @HAVE_CLOCK_01@
 HAVE_CPUTIME_01 = @HAVE_CPUTIME_01@
-HAVE_DECL_OPTARG = @HAVE_DECL_OPTARG@
 HAVE_GETRUSAGE_01 = @HAVE_GETRUSAGE_01@
 HAVE_GETTIMEOFDAY_01 = @HAVE_GETTIMEOFDAY_01@
 HAVE_HOST_CPU_FAMILY_power = @HAVE_HOST_CPU_FAMILY_power@
diff --git a/mpn/Makefile.in b/mpn/Makefile.in
index c498153e6..87726baae 100644
--- a/mpn/Makefile.in
+++ b/mpn/Makefile.in
@@ -148,7 +148,6 @@ GMP_LDFLAGS = @GMP_LDFLAGS@
 GMP_NAIL_BITS = @GMP_NAIL_BITS@
 HAVE_CLOCK_01 = @HAVE_CLOCK_01@
 HAVE_CPUTIME_01 = @HAVE_CPUTIME_01@
-HAVE_DECL_OPTARG = @HAVE_DECL_OPTARG@
 HAVE_GETRUSAGE_01 = @HAVE_GETRUSAGE_01@
 HAVE_GETTIMEOFDAY_01 = @HAVE_GETTIMEOFDAY_01@
 HAVE_HOST_CPU_FAMILY_power = @HAVE_HOST_CPU_FAMILY_power@
diff --git a/mpq/Makefile.in b/mpq/Makefile.in
index 9b259c9a9..a3180209a 100644
--- a/mpq/Makefile.in
+++ b/mpq/Makefile.in
@@ -131,7 +131,6 @@ GMP_LDFLAGS = @GMP_LDFLAGS@
 GMP_NAIL_BITS = @GMP_NAIL_BITS@
 HAVE_CLOCK_01 = @HAVE_CLOCK_01@
 HAVE_CPUTIME_01 = @HAVE_CPUTIME_01@
-HAVE_DECL_OPTARG = @HAVE_DECL_OPTARG@
 HAVE_GETRUSAGE_01 = @HAVE_GETRUSAGE_01@
 HAVE_GETTIMEOFDAY_01 = @HAVE_GETTIMEOFDAY_01@
 HAVE_HOST_CPU_FAMILY_power = @HAVE_HOST_CPU_FAMILY_power@
diff --git a/mpz/Makefile.in b/mpz/Makefile.in
index bc30ccfa5..bbd47cb96 100644
--- a/mpz/Makefile.in
+++ b/mpz/Makefile.in
@@ -159,7 +159,6 @@ GMP_LDFLAGS = @GMP_LDFLAGS@
 GMP_NAIL_BITS = @GMP_NAIL_BITS@
 HAVE_CLOCK_01 = @HAVE_CLOCK_01@
 HAVE_CPUTIME_01 = @HAVE_CPUTIME_01@
-HAVE_DECL_OPTARG = @HAVE_DECL_OPTARG@
 HAVE_GETRUSAGE_01 = @HAVE_GETRUSAGE_01@
 HAVE_GETTIMEOFDAY_01 = @HAVE_GETTIMEOFDAY_01@
 HAVE_HOST_CPU_FAMILY_power = @HAVE_HOST_CPU_FAMILY_power@
diff --git a/printf/Makefile.in b/printf/Makefile.in
index b7f555de5..b2dda040a 100644
--- a/printf/Makefile.in
+++ b/printf/Makefile.in
@@ -130,7 +130,6 @@ GMP_LDFLAGS = @GMP_LDFLAGS@
 GMP_NAIL_BITS = @GMP_NAIL_BITS@
 HAVE_CLOCK_01 = @HAVE_CLOCK_01@
 HAVE_CPUTIME_01 = @HAVE_CPUTIME_01@
-HAVE_DECL_OPTARG = @HAVE_DECL_OPTARG@
 HAVE_GETRUSAGE_01 = @HAVE_GETRUSAGE_01@
 HAVE_GETTIMEOFDAY_01 = @HAVE_GETTIMEOFDAY_01@
 HAVE_HOST_CPU_FAMILY_power = @HAVE_HOST_CPU_FAMILY_power@
diff --git a/scanf/Makefile.in b/scanf/Makefile.in
index 06113ba69..cc7475d96 100644
--- a/scanf/Makefile.in
+++ b/scanf/Makefile.in
@@ -127,7 +127,6 @@ GMP_LDFLAGS = @GMP_LDFLAGS@
 GMP_NAIL_BITS = @GMP_NAIL_BITS@
 HAVE_CLOCK_01 = @HAVE_CLOCK_01@
 HAVE_CPUTIME_01 = @HAVE_CPUTIME_01@
-HAVE_DECL_OPTARG = @HAVE_DECL_OPTARG@
 HAVE_GETRUSAGE_01 = @HAVE_GETRUSAGE_01@
 HAVE_GETTIMEOFDAY_01 = @HAVE_GETTIMEOFDAY_01@
 HAVE_HOST_CPU_FAMILY_power = @HAVE_HOST_CPU_FAMILY_power@
diff --git a/tests/Makefile.in b/tests/Makefile.in
index fca58ac66..2b6f7cddc 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -196,7 +196,6 @@ GMP_LDFLAGS = @GMP_LDFLAGS@
 GMP_NAIL_BITS = @GMP_NAIL_BITS@
 HAVE_CLOCK_01 = @HAVE_CLOCK_01@
 HAVE_CPUTIME_01 = @HAVE_CPUTIME_01@
-HAVE_DECL_OPTARG = @HAVE_DECL_OPTARG@
 HAVE_GETRUSAGE_01 = @HAVE_GETRUSAGE_01@
 HAVE_GETTIMEOFDAY_01 = @HAVE_GETTIMEOFDAY_01@
 HAVE_HOST_CPU_FAMILY_power = @HAVE_HOST_CPU_FAMILY_power@
diff --git a/tests/cxx/Makefile.in b/tests/cxx/Makefile.in
index 33b57b102..18cabc7a6 100644
--- a/tests/cxx/Makefile.in
+++ b/tests/cxx/Makefile.in
@@ -213,7 +213,6 @@ GMP_LDFLAGS = @GMP_LDFLAGS@
 GMP_NAIL_BITS = @GMP_NAIL_BITS@
 HAVE_CLOCK_01 = @HAVE_CLOCK_01@
 HAVE_CPUTIME_01 = @HAVE_CPUTIME_01@
-HAVE_DECL_OPTARG = @HAVE_DECL_OPTARG@
 HAVE_GETRUSAGE_01 = @HAVE_GETRUSAGE_01@
 HAVE_GETTIMEOFDAY_01 = @HAVE_GETTIMEOFDAY_01@
 HAVE_HOST_CPU_FAMILY_power = @HAVE_HOST_CPU_FAMILY_power@
diff --git a/tests/devel/Makefile.in b/tests/devel/Makefile.in
index f29d63d55..49059bec7 100644
--- a/tests/devel/Makefile.in
+++ b/tests/devel/Makefile.in
@@ -186,7 +186,6 @@ GMP_LDFLAGS = @GMP_LDFLAGS@
 GMP_NAIL_BITS = @GMP_NAIL_BITS@
 HAVE_CLOCK_01 = @HAVE_CLOCK_01@
 HAVE_CPUTIME_01 = @HAVE_CPUTIME_01@
-HAVE_DECL_OPTARG = @HAVE_DECL_OPTARG@
 HAVE_GETRUSAGE_01 = @HAVE_GETRUSAGE_01@
 HAVE_GETTIMEOFDAY_01 = @HAVE_GETTIMEOFDAY_01@
 HAVE_HOST_CPU_FAMILY_power = @HAVE_HOST_CPU_FAMILY_power@
diff --git a/tests/misc/Makefile.in b/tests/misc/Makefile.in
index df66df46f..5e4b67968 100644
--- a/tests/misc/Makefile.in
+++ b/tests/misc/Makefile.in
@@ -136,7 +136,6 @@ GMP_LDFLAGS = @GMP_LDFLAGS@
 GMP_NAIL_BITS = @GMP_NAIL_BITS@
 HAVE_CLOCK_01 = @HAVE_CLOCK_01@
 HAVE_CPUTIME_01 = @HAVE_CPUTIME_01@
-HAVE_DECL_OPTARG = @HAVE_DECL_OPTARG@
 HAVE_GETRUSAGE_01 = @HAVE_GETRUSAGE_01@
 HAVE_GETTIMEOFDAY_01 = @HAVE_GETTIMEOFDAY_01@
 HAVE_HOST_CPU_FAMILY_power = @HAVE_HOST_CPU_FAMILY_power@
diff --git a/tests/mpbsd/Makefile.in b/tests/mpbsd/Makefile.in
index 72d56dc42..2adbb1555 100644
--- a/tests/mpbsd/Makefile.in
+++ b/tests/mpbsd/Makefile.in
@@ -136,7 +136,6 @@ GMP_LDFLAGS = @GMP_LDFLAGS@
 GMP_NAIL_BITS = @GMP_NAIL_BITS@
 HAVE_CLOCK_01 = @HAVE_CLOCK_01@
 HAVE_CPUTIME_01 = @HAVE_CPUTIME_01@
-HAVE_DECL_OPTARG = @HAVE_DECL_OPTARG@
 HAVE_GETRUSAGE_01 = @HAVE_GETRUSAGE_01@
 HAVE_GETTIMEOFDAY_01 = @HAVE_GETTIMEOFDAY_01@
 HAVE_HOST_CPU_FAMILY_power = @HAVE_HOST_CPU_FAMILY_power@
diff --git a/tests/mpf/Makefile.in b/tests/mpf/Makefile.in
index 6813d4f58..61e747edf 100644
--- a/tests/mpf/Makefile.in
+++ b/tests/mpf/Makefile.in
@@ -268,7 +268,6 @@ GMP_LDFLAGS = @GMP_LDFLAGS@
 GMP_NAIL_BITS = @GMP_NAIL_BITS@
 HAVE_CLOCK_01 = @HAVE_CLOCK_01@
 HAVE_CPUTIME_01 = @HAVE_CPUTIME_01@
-HAVE_DECL_OPTARG = @HAVE_DECL_OPTARG@
 HAVE_GETRUSAGE_01 = @HAVE_GETRUSAGE_01@
 HAVE_GETTIMEOFDAY_01 = @HAVE_GETTIMEOFDAY_01@
 HAVE_HOST_CPU_FAMILY_power = @HAVE_HOST_CPU_FAMILY_power@
diff --git a/tests/mpn/Makefile.in b/tests/mpn/Makefile.in
index c1ffd0a66..b4a8bd08c 100644
--- a/tests/mpn/Makefile.in
+++ b/tests/mpn/Makefile.in
@@ -183,7 +183,6 @@ GMP_LDFLAGS = @GMP_LDFLAGS@
 GMP_NAIL_BITS = @GMP_NAIL_BITS@
 HAVE_CLOCK_01 = @HAVE_CLOCK_01@
 HAVE_CPUTIME_01 = @HAVE_CPUTIME_01@
-HAVE_DECL_OPTARG = @HAVE_DECL_OPTARG@
 HAVE_GETRUSAGE_01 = @HAVE_GETRUSAGE_01@
 HAVE_GETTIMEOFDAY_01 = @HAVE_GETTIMEOFDAY_01@
 HAVE_HOST_CPU_FAMILY_power = @HAVE_HOST_CPU_FAMILY_power@
diff --git a/tests/mpq/Makefile.in b/tests/mpq/Makefile.in
index cd8d7ed60..a0fa1f713 100644
--- a/tests/mpq/Makefile.in
+++ b/tests/mpq/Makefile.in
@@ -182,7 +182,6 @@ GMP_LDFLAGS = @GMP_LDFLAGS@
 GMP_NAIL_BITS = @GMP_NAIL_BITS@
 HAVE_CLOCK_01 = @HAVE_CLOCK_01@
 HAVE_CPUTIME_01 = @HAVE_CPUTIME_01@
-HAVE_DECL_OPTARG = @HAVE_DECL_OPTARG@
 HAVE_GETRUSAGE_01 = @HAVE_GETRUSAGE_01@
 HAVE_GETTIMEOFDAY_01 = @HAVE_GETTIMEOFDAY_01@
 HAVE_HOST_CPU_FAMILY_power = @HAVE_HOST_CPU_FAMILY_power@
diff --git a/tests/mpz/Makefile.in b/tests/mpz/Makefile.in
index a2d1b6d5e..778682bcf 100644
--- a/tests/mpz/Makefile.in
+++ b/tests/mpz/Makefile.in
@@ -439,7 +439,6 @@ GMP_LDFLAGS = @GMP_LDFLAGS@
 GMP_NAIL_BITS = @GMP_NAIL_BITS@
 HAVE_CLOCK_01 = @HAVE_CLOCK_01@
 HAVE_CPUTIME_01 = @HAVE_CPUTIME_01@
-HAVE_DECL_OPTARG = @HAVE_DECL_OPTARG@
 HAVE_GETRUSAGE_01 = @HAVE_GETRUSAGE_01@
 HAVE_GETTIMEOFDAY_01 = @HAVE_GETTIMEOFDAY_01@
 HAVE_HOST_CPU_FAMILY_power = @HAVE_HOST_CPU_FAMILY_power@
diff --git a/tests/rand/Makefile.in b/tests/rand/Makefile.in
index 724253568..90cb6e31c 100644
--- a/tests/rand/Makefile.in
+++ b/tests/rand/Makefile.in
@@ -188,7 +188,6 @@ GMP_LDFLAGS = @GMP_LDFLAGS@
 GMP_NAIL_BITS = @GMP_NAIL_BITS@
 HAVE_CLOCK_01 = @HAVE_CLOCK_01@
 HAVE_CPUTIME_01 = @HAVE_CPUTIME_01@
-HAVE_DECL_OPTARG = @HAVE_DECL_OPTARG@
 HAVE_GETRUSAGE_01 = @HAVE_GETRUSAGE_01@
 HAVE_GETTIMEOFDAY_01 = @HAVE_GETTIMEOFDAY_01@
 HAVE_HOST_CPU_FAMILY_power = @HAVE_HOST_CPU_FAMILY_power@
diff --git a/tune/Makefile.in b/tune/Makefile.in
index 496ca5d64..0bcd7a55c 100644
--- a/tune/Makefile.in
+++ b/tune/Makefile.in
@@ -184,7 +184,6 @@ GMP_LDFLAGS = @GMP_LDFLAGS@
 GMP_NAIL_BITS = @GMP_NAIL_BITS@
 HAVE_CLOCK_01 = @HAVE_CLOCK_01@
 HAVE_CPUTIME_01 = @HAVE_CPUTIME_01@
-HAVE_DECL_OPTARG = @HAVE_DECL_OPTARG@
 HAVE_GETRUSAGE_01 = @HAVE_GETRUSAGE_01@
 HAVE_GETTIMEOFDAY_01 = @HAVE_GETTIMEOFDAY_01@
 HAVE_HOST_CPU_FAMILY_power = @HAVE_HOST_CPU_FAMILY_power@