- uniqify/alphabetize compler option tests.

1 files changed, 55 insertions, 50 deletions

diff --git a/configure.ac b/configure.ac
index 1ac9dbc..0eb6012 100755
--- a/configure.ac
+++ b/configure.ac
@@ -21,6 +21,10 @@ AC_CONFIG_AUX_DIR([build-aux])
 AC_CANONICAL_HOST
 AM_INIT_AUTOMAKE([1.11 color-tests -Wall -Werror foreign])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+# --- libtool-2.4.6 uses "cru" with error msg
+#       /usr/bin/ar: `u' modifier ignored since `D' is the default (see `U')
+AC_SUBST([AR_FLAGS], [cr])
+
 #
 # Checks for programs.
 # Set common system defines for POSIX extensions, such as GNU_SOURCE
@@ -66,79 +70,76 @@ AC_ARG_ENABLE([gcc-warnings],
 AS_IF([test "x$popt_gcc_warnings" = xyes],
   [ # Add/Delete as needed
   MAX_STACK_SIZE=32768
-  popt_CFLAGS_ADD([-Wall], [POPT_CFLAGS])
-  popt_CFLAGS_ADD([-pedantic], [POPT_CFLAGS])
-  popt_CFLAGS_ADD([-Wextra], [POPT_CFLAGS])
-  popt_CFLAGS_ADD([-Wformat-y2k], [POPT_CFLAGS])
+  popt_CFLAGS_ADD([-fasynchronous-unwind-tables],[POPT_CFLAGS])
   popt_CFLAGS_ADD([-fdiagnostics-show-option],[POPT_CFLAGS])
-  popt_CFLAGS_ADD([-funit-at-a-time],[POPT_CFLAGS])
+  popt_CFLAGS_ADD([-fipa-pure-const],[POPT_CFLAGS])
+  popt_CFLAGS_ADD([-fstack-protector-all],[POPT_CFLAGS])
   popt_CFLAGS_ADD([-fstrict-aliasing],[POPT_CFLAGS])
-  popt_CFLAGS_ADD([-Wstrict-overflow],[POPT_CFLAGS])
   popt_CFLAGS_ADD([-fstrict-overflow],[POPT_CFLAGS])
-  popt_CFLAGS_ADD([-Wpointer-arith],[POPT_CFLAGS])
-  popt_CFLAGS_ADD([-Wundef],[POPT_CFLAGS])
-  popt_CFLAGS_ADD([-Wformat-security],[POPT_CFLAGS])
-  popt_CFLAGS_ADD([-Winit-self],[POPT_CFLAGS])
-  popt_CFLAGS_ADD([-Wmissing-include-dirs],[POPT_CFLAGS])
-  popt_CFLAGS_ADD([-Wunused],[POPT_CFLAGS])
-  popt_CFLAGS_ADD([-Wunknown-pragmas],[POPT_CFLAGS])
-  popt_CFLAGS_ADD([-Wstrict-aliasing],[POPT_CFLAGS])
-  popt_CFLAGS_ADD([-Wshadow],[POPT_CFLAGS])
-  popt_CFLAGS_ADD([-Wbad-function-cast],[POPT_CFLAGS])
-  popt_CFLAGS_ADD([-Wcast-align],[POPT_CFLAGS])
-  popt_CFLAGS_ADD([-Wwrite-strings],[POPT_CFLAGS])
-  popt_CFLAGS_ADD([-Wlogical-op],[POPT_CFLAGS])
+  popt_CFLAGS_ADD([-funit-at-a-time],[POPT_CFLAGS])
+  popt_CFLAGS_ADD([-pedantic], [POPT_CFLAGS])
   popt_CFLAGS_ADD([-Waggregate-return],[POPT_CFLAGS])
-  popt_CFLAGS_ADD([-Wstrict-prototypes],[POPT_CFLAGS])
-  popt_CFLAGS_ADD([-Wold-style-definition],[POPT_CFLAGS])
-  popt_CFLAGS_ADD([-Wmissing-prototypes],[POPT_CFLAGS])
-  popt_CFLAGS_ADD([-Wmissing-declarations],[POPT_CFLAGS])
-  popt_CFLAGS_ADD([-Wmissing-noreturn],[POPT_CFLAGS])
-  popt_CFLAGS_ADD([-Wmissing-format-attribute],[POPT_CFLAGS])
-  popt_CFLAGS_ADD([-Wredundant-decls],[POPT_CFLAGS])
-  popt_CFLAGS_ADD([-Wnested-externs],[POPT_CFLAGS])
-  popt_CFLAGS_ADD([-Winline],[POPT_CFLAGS])
-  popt_CFLAGS_ADD([-Winvalid-pch],[POPT_CFLAGS])
-  popt_CFLAGS_ADD([-Wvolatile-register-var],[POPT_CFLAGS])
-  popt_CFLAGS_ADD([-Wdisabled-optimization],[POPT_CFLAGS])
-  popt_CFLAGS_ADD([-Wbuiltin-macro-redefined],[POPT_CFLAGS])
-  popt_CFLAGS_ADD([-Wmudflap],[POPT_CFLAGS])
-  popt_CFLAGS_ADD([-Wpacked-bitfield-compat],[POPT_CFLAGS])
-  popt_CFLAGS_ADD([-Wsync-nand],[POPT_CFLAGS])
+  popt_CFLAGS_ADD([-Wall], [POPT_CFLAGS])
   popt_CFLAGS_ADD([-Wattributes],[POPT_CFLAGS])
+  popt_CFLAGS_ADD([-Wbad-function-cast],[POPT_CFLAGS])
+  popt_CFLAGS_ADD([-Wbuiltin-macro-redefined],[POPT_CFLAGS])
+  popt_CFLAGS_ADD([-Wcast-align],[POPT_CFLAGS])
   popt_CFLAGS_ADD([-Wcoverage-mismatch],[POPT_CFLAGS])
-  popt_CFLAGS_ADD([-Wmultichar],[POPT_CFLAGS])
   popt_CFLAGS_ADD([-Wcpp],[POPT_CFLAGS])
+  popt_CFLAGS_ADD([-Wdeclaration-after-statement],[POPT_CFLAGS])
   popt_CFLAGS_ADD([-Wdeprecated-declarations],[POPT_CFLAGS])
+  popt_CFLAGS_ADD([-Wdisabled-optimization],[POPT_CFLAGS])
   popt_CFLAGS_ADD([-Wdiv-by-zero],[POPT_CFLAGS])
   popt_CFLAGS_ADD([-Wdouble-promotion],[POPT_CFLAGS])
   popt_CFLAGS_ADD([-Wendif-labels],[POPT_CFLAGS])
+  popt_CFLAGS_ADD([-Wextra], [POPT_CFLAGS])
+  popt_CFLAGS_ADD([-Wformat=2],[POPT_CFLAGS])
   popt_CFLAGS_ADD([-Wformat-contains-nul],[POPT_CFLAGS])
   popt_CFLAGS_ADD([-Wformat-extra-args],[POPT_CFLAGS])
+  popt_CFLAGS_ADD([-Wformat-security],[POPT_CFLAGS])
+  popt_CFLAGS_ADD([-Wformat-y2k], [POPT_CFLAGS])
   popt_CFLAGS_ADD([-Wformat-zero-length],[POPT_CFLAGS])
-  popt_CFLAGS_ADD([-Wformat=2],[POPT_CFLAGS])
+  popt_CFLAGS_ADD([-Wframe-larger-than=$MAX_STACK_SIZE],[POPT_CFLAGS])
+  popt_CFLAGS_ADD([-Winit-self],[POPT_CFLAGS])
+  popt_CFLAGS_ADD([-Winline],[POPT_CFLAGS])
+  popt_CFLAGS_ADD([-Winvalid-pch],[POPT_CFLAGS])
+  popt_CFLAGS_ADD([-Wjump-misses-init],[POPT_CFLAGS])
+  popt_CFLAGS_ADD([-Wlogical-op],[POPT_CFLAGS])
+  popt_CFLAGS_ADD([-Wmissing-declarations],[POPT_CFLAGS])
+  popt_CFLAGS_ADD([-Wmissing-format-attribute],[POPT_CFLAGS])
+  popt_CFLAGS_ADD([-Wmissing-include-dirs],[POPT_CFLAGS])
+  popt_CFLAGS_ADD([-Wmissing-noreturn],[POPT_CFLAGS])
+  popt_CFLAGS_ADD([-Wmissing-prototypes],[POPT_CFLAGS])
+  popt_CFLAGS_ADD([-Wmudflap],[POPT_CFLAGS])
   popt_CFLAGS_ADD([-Wmultichar],[POPT_CFLAGS])
+  popt_CFLAGS_ADD([-Wnested-externs],[POPT_CFLAGS])
+  popt_CFLAGS_ADD([-Wno-aggregate-return],[POPT_CFLAGS])
+  popt_CFLAGS_ADD([-Wno-format-nonliteral],[POPT_CFLAGS])
+  popt_CFLAGS_ADD([-Wno-missing-field-initializers],[POPT_CFLAGS])
+  popt_CFLAGS_ADD([-Wno-redundant-decls],[POPT_CFLAGS])
   popt_CFLAGS_ADD([-Wnormalized=nfc],[POPT_CFLAGS])
+  popt_CFLAGS_ADD([-Wno-sign-compare],[POPT_CFLAGS])
+  popt_CFLAGS_ADD([-Wold-style-definition],[POPT_CFLAGS])
   popt_CFLAGS_ADD([-Woverflow],[POPT_CFLAGS])
+  popt_CFLAGS_ADD([-Wpacked-bitfield-compat],[POPT_CFLAGS])
+  popt_CFLAGS_ADD([-Wpointer-arith],[POPT_CFLAGS])
   popt_CFLAGS_ADD([-Wpointer-to-int-cast],[POPT_CFLAGS])
   popt_CFLAGS_ADD([-Wpragmas],[POPT_CFLAGS])
+  popt_CFLAGS_ADD([-Wredundant-decls],[POPT_CFLAGS])
+  popt_CFLAGS_ADD([-Wshadow],[POPT_CFLAGS])
+  popt_CFLAGS_ADD([-Wstrict-aliasing],[POPT_CFLAGS])
+  popt_CFLAGS_ADD([-Wstrict-overflow],[POPT_CFLAGS])
+  popt_CFLAGS_ADD([-Wstrict-prototypes],[POPT_CFLAGS])
   popt_CFLAGS_ADD([-Wsuggest-attribute=const],[POPT_CFLAGS])
   popt_CFLAGS_ADD([-Wsuggest-attribute=noreturn],[POPT_CFLAGS])
   popt_CFLAGS_ADD([-Wsuggest-attribute=pure],[POPT_CFLAGS])
+  popt_CFLAGS_ADD([-Wsync-nand],[POPT_CFLAGS])
   popt_CFLAGS_ADD([-Wtrampolines],[POPT_CFLAGS])
-  popt_CFLAGS_ADD([-Wno-missing-field-initializers],[POPT_CFLAGS])
-  popt_CFLAGS_ADD([-Wno-sign-compare],[POPT_CFLAGS])
-  popt_CFLAGS_ADD([-Wjump-misses-init],[POPT_CFLAGS])
-  popt_CFLAGS_ADD([-Wno-format-nonliteral],[POPT_CFLAGS])
-  popt_CFLAGS_ADD([-Wframe-larger-than=$MAX_STACK_SIZE],[POPT_CFLAGS])
-  popt_CFLAGS_ADD([-fstack-protector-all],[POPT_CFLAGS])
-  popt_CFLAGS_ADD([-fasynchronous-unwind-tables],[POPT_CFLAGS])
-  popt_CFLAGS_ADD([-fdiagnostics-show-option],[POPT_CFLAGS])
-  popt_CFLAGS_ADD([-funit-at-a-time],[POPT_CFLAGS])
-  popt_CFLAGS_ADD([-fipa-pure-const],[POPT_CFLAGS])
-  popt_CFLAGS_ADD([-Wno-aggregate-return],[POPT_CFLAGS])
-  popt_CFLAGS_ADD([-Wno-redundant-decls],[POPT_CFLAGS])
-  popt_CFLAGS_ADD([-Wdeclaration-after-statement],[POPT_CFLAGS])
+  popt_CFLAGS_ADD([-Wundef],[POPT_CFLAGS])
+  popt_CFLAGS_ADD([-Wunknown-pragmas],[POPT_CFLAGS])
+  popt_CFLAGS_ADD([-Wunused],[POPT_CFLAGS])
+  popt_CFLAGS_ADD([-Wvolatile-register-var],[POPT_CFLAGS])
+  popt_CFLAGS_ADD([-Wwrite-strings],[POPT_CFLAGS])
   ])
 
 # build popt with mudflap instrumentation (GCC only)
@@ -184,6 +185,10 @@ AS_IF([ test x"$popt_gcc_mudflap" = x"yes" ],
       ])
      
 
+dnl # build popt instrumented for -fPIC always
+dnl #  popt_CFLAGS_ADD([-fPIC -DPIC], [POPT_CFLAGS])
+dnl #  popt_CFLAGS_ADD([-KPIC -DPIC], [POPT_CFLAGS])
+
 # build popt instrumented for -fPIE (GCC only)
 AC_ARG_ENABLE([build-pie],
   [AS_HELP_STRING([--enable-build-pie],