Skip to content

Commit

Permalink
m4/ax_check_openssl.m4: respect --with-openssl=yes in addition to =no
Browse files Browse the repository at this point in the history
configure: update version to 2.1.2

Reported-By: Wade Cline <[email protected]>
  • Loading branch information
aaronmdjones committed Sep 12, 2017
1 parent 42dcaa5 commit 9a92be2
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 16 deletions.
26 changes: 14 additions & 12 deletions configure
Original file line number Diff line number Diff line change
@@ -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>.
#
Expand Down Expand Up @@ -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=''

Expand Down Expand Up @@ -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]...
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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 $@
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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\\"
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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])

Expand Down
8 changes: 5 additions & 3 deletions m4/ax_check_openssl.m4
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 9a92be2

Please sign in to comment.