Try using -man instead of -mandoc in test-manpages on OpenBSD

[nmh] / configure.ac

diff --git a/configure.ac b/configure.ac
index 271cd09aedd0b15d90f8d7e0a6741686d259a4b5..ce4b46d561f5b5d9e24999ecbf3bfa02651499ff 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -93,19 +93,15 @@ dnl ------------------
 dnl We want these before the checks,
 dnl so the checks can modify their values.
 test -z "$CFLAGS" && CFLAGS= auto_cflags=1
 dnl We want these before the checks,
 dnl so the checks can modify their values.
 test -z "$CFLAGS" && CFLAGS= auto_cflags=1

-if test x"$enable_debug" = x"yes"; then
-  test -z "$LDFLAGS" && LDFLAGS=-g
-fi

 
 

-dnl Use SunStudio cc on Solaris.
-if test -d /opt/solarisstudio12.3/bin; then
-  PATH=/opt/solarisstudio12.3/bin:$PATH
-  CC='/opt/solarisstudio12.3/bin/cc +w2'; export CC
-fi
-
-AC_PROG_CC([cc clang gcc])
+AC_PROG_CC([cc gcc])

 AM_PROG_CC_C_O
 
 AM_PROG_CC_C_O
 

+dnl Use -v and some other options with SunStudio cc.
+AS_CASE([`${CC} -V 2>&1`],
+       [cc:\ Sun\ C*], [CFLAGS="${CFLAGS:+$CFLAGS }-v -errtags=yes"
+                        CFLAGS="${CFLAGS} -erroff=E_STATEMENT_NOT_REACHED"])
+

 AC_CACHE_CHECK([whether compiler supports -Wextra], [nmh_cv_has_wextra],
 [nmh_saved_cflags="$CFLAGS"
  CFLAGS="$CFLAGS -Wextra -Werror"
 AC_CACHE_CHECK([whether compiler supports -Wextra], [nmh_cv_has_wextra],
 [nmh_saved_cflags="$CFLAGS"
  CFLAGS="$CFLAGS -Wextra -Werror"


@@ -127,20 +123,6 @@ if test "$GCC" = yes; then
        [nmh_cv_has_dash_ansi=no])
      CPPFLAGS="$nmh_saved_cppflags"
      CFLAGS="$nmh_saved_cflags"])
        [nmh_cv_has_dash_ansi=no])
      CPPFLAGS="$nmh_saved_cppflags"
      CFLAGS="$nmh_saved_cflags"])

-
-  dnl Disable clang complaint about unused -ansi when linking.
-  AC_CACHE_CHECK([whether linker supports -Qunused-arguments],
-                 [nmh_cv_has_q_unused_arguments],
-    [nmh_saved_ldflags="$LDFLAGS"
-     LDFLAGS="$LDFLAGS -Qunused-arguments"
-     AC_TRY_LINK([],[],nmh_cv_has_q_unused_arguments=yes,
-                 nmh_cv_has_q_unused_arguments=no)
-     LDFLAGS="$nmh_saved_ldflags"])
-
-  if test "$nmh_cv_has_q_unused_arguments" = "yes"; then
-    test -z "$LDFLAGS" && LDFLAGS=-Qunused-arguments \
-                       || LDFLAGS="$LDFLAGS -Qunused-arguments"
-  fi

 else
   nmh_cv_has_dash_ansi=no
 fi
 else
   nmh_cv_has_dash_ansi=no
 fi


@@ -170,26 +152,49 @@ if test -n "$auto_cflags"; then
       test -z "$CFLAGS" && CFLAGS=-g || CFLAGS="$CFLAGS -g"
     fi
   else
       test -z "$CFLAGS" && CFLAGS=-g || CFLAGS="$CFLAGS -g"
     fi
   else

-    if test -z "$LDFLAGS"; then
-      case "$build_os" in
-       darwin*)
-         LDFLAGS=
-          ;;
-       *)
-         LDFLAGS=-s
-         ;;
-      esac
-    fi

     if test -n "$GCC"; then
       test -z "$CFLAGS" && CFLAGS="$nmh_gcc_warnflags -O2" || CFLAGS="$CFLAGS $nmh_gcc_warnflags -O2"
     else
       test -z "$CFLAGS" && CFLAGS=-O  || CFLAGS="$CFLAGS -O"
     fi
     if test -n "$GCC"; then
       test -z "$CFLAGS" && CFLAGS="$nmh_gcc_warnflags -O2" || CFLAGS="$CFLAGS $nmh_gcc_warnflags -O2"
     else
       test -z "$CFLAGS" && CFLAGS=-O  || CFLAGS="$CFLAGS -O"
     fi

-    AC_DEFINE([NDEBUG], [1],
-              [Define to disable run-time debugging and asserts.])

   fi
 fi
 
   fi
 fi
 

+dnl -----------------
+dnl CUSTOMIZE LDFLAGS
+dnl -----------------
+if test "$GCC" = yes; then
+  dnl Disable clang complaint about unused -ansi when linking.
+  AC_CACHE_CHECK([whether linker supports -Qunused-arguments],
+                 [nmh_cv_has_q_unused_arguments],
+                 [nmh_saved_ldflags="$LDFLAGS"
+                  LDFLAGS="$LDFLAGS -Qunused-arguments"
+                  AC_TRY_LINK([],[],nmh_cv_has_q_unused_arguments=yes,
+                                    nmh_cv_has_q_unused_arguments=no)
+                  LDFLAGS="$nmh_saved_ldflags"])
+  test "$nmh_cv_has_q_unused_arguments" = "yes"  &&  \
+    LDFLAGS="${LDFLAGS:+$LDFLAGS }-Qunused-arguments"
+fi
+
+dnl This really shouldn't be necessary.  And we really shouldn't add -s.
+if test x"$enable_debug" = x"yes"; then
+  test -z "$LDFLAGS" && LDFLAGS=-g
+else
+  if test -z "$LDFLAGS"; then
+    case "$build_os" in
+      darwin*) LDFLAGS= ;;
+            *) LDFLAGS=-s ;;
+    esac
+  fi
+fi
+
+dnl This hack turns off assertions by default, assuming
+dnl that configure still uses this shell variable.  Without
+dnl it, AC_HEADER_ASSERT enables assertions by default.
+test -z "$enable_assert"  &&  enable_assert=no
+
+AC_HEADER_ASSERT
+

 dnl ------------------
 dnl CHECK FOR PROGRAMS
 dnl ------------------
 dnl ------------------
 dnl CHECK FOR PROGRAMS
 dnl ------------------


@@ -584,10 +589,10 @@ dnl 2.5.35-37 that cause signed/unsigned mismatch,
 dnl http://sourceforge.net/p/flex/bugs/140/
 AS_IF([test "$LEX" = flex],
       [AS_CASE([`$LEX -V`],
 dnl http://sourceforge.net/p/flex/bugs/140/
 AS_IF([test "$LEX" = flex],
       [AS_CASE([`$LEX -V`],

-               [flex\ 2.5.35], [[LFLAGS=\
-'; printf "%s\n" '\''1,$$s/(size_t) \(num_to_read\)/\1/'\'' w q | ed -s $@']],
-               [flex\ 2.5.3@<:@67@:>@], [[LFLAGS=\
-'; printf "%s\n" '\''1,$$s/\(  \)int i;/\1yy_size_t i;/'\'' w q | ed -s $@']])
+               [flex\ 2.5.35], [LFLAGS=\
+'; printf "%s\n" '\''1,$$s/(size_t) \(num_to_read\)/\1/'\'' w q | ed -s $@'],
+               [flex\ 2.5.3@<:@67@:>@], [LFLAGS=\
+'; printf "%s\n" '\''1,$$s/\(  \)int i;/\1yy_size_t i;/'\'' w q | ed -s $@'])

        AC_SUBST([LFLAGS])])
 
 dnl --------------
        AC_SUBST([LFLAGS])])
 
 dnl --------------