Added debug statements to test-mhparam.

[nmh] / docs / contrib / build_nmh

diff --git a/docs/contrib/build_nmh b/docs/contrib/build_nmh
index 2aa196ecaae30e6584feef1af3b2c9f60e0e4e0d..25a02642c3aa05dee2aea3e2f6150b6186e13f98 100755 (executable)
--- a/docs/contrib/build_nmh
+++ b/docs/contrib/build_nmh
@@ -37,6 +37,7 @@
 #   ncurses-devel
 #   cyrus-sasl-devel, if using sasl
 #   openssl-devel, if using TLS
 #   ncurses-devel
 #   cyrus-sasl-devel, if using sasl
 #   openssl-devel, if using TLS

+#   libcurl-devel, if using oauth

 #   autoconf and automake, with -s (see docs/README.developers for versions)
 #   rpm-build, with -r
 
 #   autoconf and automake, with -s (see docs/README.developers for versions)
 #   rpm-build, with -r
 


@@ -84,9 +85,7 @@ if [ $# -gt 0 ]; then
 fi
 
 #### Check to see that we're in a nmh source directory.
 fi
 
 #### Check to see that we're in a nmh source directory.

-if grep 'the authors of nmh' COPYRIGHT >/dev/null; then
-  :
-else
+if ! grep 'the authors of nmh' COPYRIGHT >/dev/null; then

   echo "$0: not in nmh source directory"
   exit 1
 fi
   echo "$0: not in nmh source directory"
   exit 1
 fi


@@ -104,6 +103,7 @@ config_mts=smtp
 config_smtpservers=localhost
 config_sasl=n
 config_tls=n
 config_smtpservers=localhost
 config_sasl=n
 config_tls=n

+config_oauth=n

 config_debug=n
 
 
 config_debug=n
 
 


@@ -119,6 +119,11 @@ finddir() {
   esac
 }
 
   esac
 }
 

+#### Figure out whether or not to use -n with tail.
+case `printf 'OK\n' | tail -n 1 2>&1` in
+  OK) tail='tail -n ' ;;
+  *)  tail='tail -' ;;
+esac

 
 if install-mh -check >/dev/null 2>&1; then
   # Determine config options from installed nmh.
 
 if install-mh -check >/dev/null 2>&1; then
   # Determine config options from installed nmh.


@@ -126,7 +131,7 @@ if install-mh -check >/dev/null 2>&1; then
 
   config_prefix=`cd $mhbin/.. && pwd`
 
 
   config_prefix=`cd $mhbin/.. && pwd`
 

-  mtsconf=`dirname "$mhbin"`/etc/mts.conf
+  mtsconf=`mhparam etcdir`/mts.conf

   if [ -f "$mtsconf" ]; then
     mts_entry=`grep '^mts:' "$mtsconf"`
     if [ "$mts_entry" ]; then
   if [ -f "$mtsconf" ]; then
     mts_entry=`grep '^mts:' "$mtsconf"`
     if [ "$mts_entry" ]; then


@@ -145,13 +150,24 @@ if install-mh -check >/dev/null 2>&1; then
   fi
 
   if test -x "$mhbin/mhparam"; then
   fi
 
   if test -x "$mhbin/mhparam"; then

-    case `$mhbin/mhparam sasl` in
-      *sasl*) config_sasl=y ;;
-    esac
-
-    case `$mhbin/mhparam tls` in
-      *tls*) config_tls=y ;;
-    esac
+    if mhparam sasl >/dev/null; then
+      case `$mhbin/mhparam sasl` in
+        *sasl*) config_sasl=y ;;
+      esac
+
+      case `$mhbin/mhparam tls` in
+        *tls*) config_tls=y ;;
+      esac
+
+      case `$mhbin/mhparam oauth` in
+        *oauth*) config_oauth=y ;;
+      esac
+    else
+      tput smso
+      echo "$0: SASL, TLS, and OAuth2 detection not supported with current nmh"
+      [ $yes -eq 1 ]  &&  echo "will not configure them in"
+      tput rmso
+    fi

   fi
 fi
 
   fi
 fi
 


@@ -194,6 +210,14 @@ if [ $yes -eq 0 ]; then
     config_tls=n
   fi
 
     config_tls=n
   fi
 

+  printf 'OAuth2 support [%s]: ' $config_oauth
+  read response
+  if [ "$response" = y  -o  "$response" = Y ]; then
+    config_oauth=y
+  elif [ "$response" = n  -o  "$response" = N ]; then
+    config_oauth=n
+  fi
+

   #### Don't confirm debug here:  obey the -d option to this script.
 fi
 
   #### Don't confirm debug here:  obey the -d option to this script.
 fi
 


@@ -210,9 +234,10 @@ config_opts="--prefix=$config_prefix"
   config_opts="$config_opts --with-cyrus-sasl"
 [ "$config_tls" = y ]  &&  \
   config_opts="$config_opts --with-tls"
   config_opts="$config_opts --with-cyrus-sasl"
 [ "$config_tls" = y ]  &&  \
   config_opts="$config_opts --with-tls"

+[ "$config_oauth" = y ]  &&  \
+  config_opts="$config_opts --with-oauth"

 [ $config_debug = y ]  &&  \
 [ $config_debug = y ]  &&  \

-  config_opts="$config_opts --enable-debug"
-
+  config_opts="$config_opts --enable-debug --enable-assert"

 
 #### dotlocking, the usual default, requires chgrp and chmod of inc.
 installpriv=
 
 #### dotlocking, the usual default, requires chgrp and chmod of inc.
 installpriv=


@@ -238,9 +263,7 @@ if [ -f Makefile ]; then
 fi
 
 /bin/rm -f "$logfile"
 fi
 
 /bin/rm -f "$logfile"

-if [ -f configure  -a  -f Makefile.in ]; then
-  :
-else
+if [ ! -f configure  -o  ! -f Makefile.in ]; then

   [ $verbose -ge 1 ]  &&  echo autoconfiguring . . .
   ./autogen.sh >>"$logfile" 2>&1
 fi
   [ $verbose -ge 1 ]  &&  echo autoconfiguring . . .
   ./autogen.sh >>"$logfile" 2>&1
 fi


@@ -251,7 +274,8 @@ fi
 ####
 [ $verbose -ge 1 ]  &&  echo configuring . . .
 echo ./configure $config_opts ${smtpservers:+"$smtpservers"} >>"$logfile" 2>&1
 ####
 [ $verbose -ge 1 ]  &&  echo configuring . . .
 echo ./configure $config_opts ${smtpservers:+"$smtpservers"} >>"$logfile" 2>&1

-./configure $config_opts ${smtpservers:+"$smtpservers"} >>"$logfile" 2>&1
+./configure CFLAGS="${CFLAGS:+$CFLAGS }-g -O2 -ansi -pedantic" \
+            $config_opts ${smtpservers:+"$smtpservers"} >>"$logfile" 2>&1

 status=$?
 
 if [ $status -eq 0 ]; then
 status=$?
 
 if [ $status -eq 0 ]; then


@@ -285,7 +309,7 @@ if [ $status -eq 0 ]; then
       echo "$tests_summary" >>"$logfile"
       echo '===================' >>"$logfile"
       [ "$check" = distcheck ]  &&  \
       echo "$tests_summary" >>"$logfile"
       echo '===================' >>"$logfile"
       [ "$check" = distcheck ]  &&  \

-        echo "$checkoutput" | tail -n 4 >>"$logfile"
+        echo "$checkoutput" | ${tail}4 >>"$logfile"

     fi
 
     if [ $status -eq 0 ]; then
     fi
 
     if [ $status -eq 0 ]; then