Don't `else' after return. Simplify control flow.

[nmh] / docs / contrib / build_nmh

diff --git a/docs/contrib/build_nmh b/docs/contrib/build_nmh
index 499fadea11c4998a5ac2823a825abaf19bf24066..6a9ede8cebe2cb118791fd00d3ff291eb79560c9 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
 


@@ -104,6 +105,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
 
 


@@ -158,10 +160,14 @@ if install-mh -check >/dev/null 2>&1; then
       case `$mhbin/mhparam tls` in
         *tls*) config_tls=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
     else
       tput smso

-      echo "$0: SASL and TLS detection not supported with current nmh"
-      [ $yes -eq 1 ]  &&  echo "will not configure either one in"
+      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
       tput rmso
     fi
   fi


@@ -206,6 +212,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
 


@@ -222,13 +236,14 @@ 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 --enable-assert"
-
+  config_opts="$config_opts --enable-assert"

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

-if [ $install -ge 1  -a  `id -u` -ne 0 ]; then
+if [ $install -ge 1  -a  "$LOGNAME" != root ]; then

   if [ "$config_locking" = dot ]; then
     echo "$0: "'install requires chgrp and chmod 2755'
     echo 'so will sudo to install.  Terminate with Ctrl-C if unacceptable.'
   if [ "$config_locking" = dot ]; then
     echo "$0: "'install requires chgrp and chmod 2755'
     echo 'so will sudo to install.  Terminate with Ctrl-C if unacceptable.'


@@ -250,9 +265,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


@@ -262,8 +275,18 @@ fi
 #### Build.
 ####
 [ $verbose -ge 1 ]  &&  echo configuring . . .
 #### Build.
 ####
 [ $verbose -ge 1 ]  &&  echo configuring . . .

+if [ -z "$CFLAGS" ]; then
+  #### Only use these flags with gcc.
+  if cc -dM -E - </dev/null 2>&1 | egrep __GNUC__ >/dev/null; then
+    #### configure will supply -g -O2 with gcc, but only if CFLAGS
+    #### isn't defined.
+    CFLAGS='-g -O2 -ansi -pedantic'
+  fi
+fi
+

 echo ./configure $config_opts ${smtpservers:+"$smtpservers"} >>"$logfile" 2>&1
 echo ./configure $config_opts ${smtpservers:+"$smtpservers"} >>"$logfile" 2>&1

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

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


@@ -281,6 +304,13 @@ if [ $status -eq 0 ]; then
       fi
    fi
 
       fi
    fi
 

+    if [ -n "$CFLAGS" ]; then
+        #### Pass DISTCHECK_CONFIGURE_FLAGS through an environment
+        #### variable to avoid automake's quoting.
+        DISTCHECK_CONFIGURE_FLAGS="CFLAGS='${CFLAGS}'"
+        export DISTCHECK_CONFIGURE_FLAGS
+    fi
+

     [ $verbose -ge 1 ]  &&  echo testing . . .
     checkoutput=`make $check AM_COLOR_TESTS=always 2>>"$logfile"`
     status=$?
     [ $verbose -ge 1 ]  &&  echo testing . . .
     checkoutput=`make $check AM_COLOR_TESTS=always 2>>"$logfile"`
     status=$?