From 9a92be2a01268d47714de470d81376b1a09fb5e3 Mon Sep 17 00:00:00 2001
From: Aaron Jones <aaronmdjones@gmail.com>
Date: Tue, 12 Sep 2017 08:08:09 +0000
Subject: [PATCH] m4/ax_check_openssl.m4: respect --with-openssl=yes in
 addition to =no configure: update version to 2.1.2

Reported-By: Wade Cline <wadecline@hotmail.com>
---
 configure              | 26 ++++++++++++++------------
 configure.ac           |  2 +-
 m4/ax_check_openssl.m4 |  8 +++++---
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/configure b/configure
index 6736d56..8d7d0b6 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for libmowgli-2 2.1.1.
+# Generated by GNU Autoconf 2.69 for libmowgli-2 2.1.2.
 #
 # Report bugs to <https://github.com/atheme/libmowgli-2>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='libmowgli-2'
 PACKAGE_TARNAME='libmowgli-2'
-PACKAGE_VERSION='2.1.1'
-PACKAGE_STRING='libmowgli-2 2.1.1'
+PACKAGE_VERSION='2.1.2'
+PACKAGE_STRING='libmowgli-2 2.1.2'
 PACKAGE_BUGREPORT='https://github.com/atheme/libmowgli-2'
 PACKAGE_URL=''
 
@@ -1295,7 +1295,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libmowgli-2 2.1.1 to adapt to many kinds of systems.
+\`configure' configures libmowgli-2 2.1.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1362,7 +1362,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libmowgli-2 2.1.1:";;
+     short | recursive ) echo "Configuration of libmowgli-2 2.1.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1455,7 +1455,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libmowgli-2 configure 2.1.1
+libmowgli-2 configure 2.1.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1824,7 +1824,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libmowgli-2 $as_me 2.1.1, which was
+It was created by libmowgli-2 $as_me 2.1.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -4516,12 +4516,14 @@ OPENSSL="no"
 if test "${with_openssl+set}" = set; then :
   withval=$with_openssl;
             case "$withval" in
-            "" | y | ye | yes)
-            as_fn_error $? "Invalid --with-openssl value" "$LINENO" 5
+            "")
+            as_fn_error $? "Empty --with-openssl value" "$LINENO" 5
               ;;
-            n | no)
+            n | no | N | NO)
             skip=true
               ;;
+            y | ye | yes | Y | YE | YES)
+              ;;
             *) ssldirs="$withval"
               ;;
             esac
@@ -5332,7 +5334,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libmowgli-2 $as_me 2.1.1, which was
+This file was extended by libmowgli-2 $as_me 2.1.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -5394,7 +5396,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libmowgli-2 config.status 2.1.1
+libmowgli-2 config.status 2.1.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 8a5cc00..66b421c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT([libmowgli-2],[2.1.1],[https://github.com/atheme/libmowgli-2])
+AC_INIT([libmowgli-2],[2.1.2],[https://github.com/atheme/libmowgli-2])
 AC_CONFIG_SRCDIR([src])
 AC_CONFIG_HEADER([src/libmowgli/platform/autoconf.h])
 
diff --git a/m4/ax_check_openssl.m4 b/m4/ax_check_openssl.m4
index 8927fa3..78f8806 100644
--- a/m4/ax_check_openssl.m4
+++ b/m4/ax_check_openssl.m4
@@ -44,12 +44,14 @@ AC_DEFUN([AX_CHECK_OPENSSL], [
             [root of the OpenSSL directory])],
         [
             case "$withval" in
-            "" | y | ye | yes)
-            AC_MSG_ERROR([Invalid --with-openssl value])
+            "")
+            AC_MSG_ERROR([Empty --with-openssl value])
               ;;
-            n | no)
+            n | no | N | NO)
             skip=true
               ;;
+            y | ye | yes | Y | YE | YES)
+              ;;
             *) ssldirs="$withval"
               ;;
             esac