From 3f8133b65914379bb35ac2673735a441fec4e436 Mon Sep 17 00:00:00 2001
From: Reuben Thomas <rrt@sc3d.org>
Date: Thu, 9 Feb 2017 13:34:11 +0000
Subject: Minor tidy-up of configure.ac
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Remove AM_MAINTAINER_MODE: remaking configure automatically is useful! It
shouldn’t be triggered unnecessarily for users building from source.

Remove no-define from AM_INIT_AUTOMAKE

Remove test for C89 function strerror, which is still entirely standard.

Remove AC_PROG_MAKE_SET call, result of which is not used.

Move OS X check out of Windows section.
---
 appveyor.yml |  2 +-
 configure.ac | 28 ++++++++++++----------------
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 133d764..1b25d16 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -19,4 +19,4 @@ install:
 
 # FIXME: add all available providers (just aspell?)
 build_script:
-  - C:\msys64\usr\bin\bash.exe -lc "cd c:/projects/enchant && ./autogen.sh %CONFIGURE_FLAGS% && make && make DISTCHECK_CONFIGURE_FLAGS=%CONFIGURE_FLAGS% distcheck"
+  - C:\msys64\usr\bin\bash.exe -lc "cd c:/projects/enchant && ./autogen.sh %CONFIGURE_FLAGS% && make && make DISTCHECK_CONFIGURE_FLAGS=\"%CONFIGURE_FLAGS%\" distcheck"
diff --git a/configure.ac b/configure.ac
index 13e80d6..de92b5b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,9 +2,8 @@ AC_INIT([enchant],[2.0.0])
 AC_PACKAGE_VERSION
 AC_CONFIG_SRCDIR(src/enchant.h)
 AC_CONFIG_AUX_DIR([build-aux])
-AM_INIT_AUTOMAKE([no-define subdir-objects])
+AM_INIT_AUTOMAKE([subdir-objects])
 AC_CANONICAL_HOST
-AM_MAINTAINER_MODE
 AC_CONFIG_MACRO_DIR([m4])
 
 dnl Release number rules:
@@ -38,7 +37,6 @@ AC_SUBST(ENCHANT_MINOR_VERSION)
 AC_SUBST(ENCHANT_MICRO_VERSION)
 
 dnl Checks for programs.
-AC_SEARCH_LIBS([strerror],[cposix])
 AC_PROG_CC
 gl_EARLY
 AC_PROG_CXX
@@ -46,7 +44,6 @@ AX_CXX_COMPILE_STDCXX(11)
 AC_PROG_OBJC
 AC_PROG_INSTALL
 AC_PROG_LN_S
-AC_PROG_MAKE_SET
 AC_HEADER_STDC
 LT_INIT([win32-dll])
 gl_INIT
@@ -208,18 +205,6 @@ esac
 AC_MSG_RESULT([$native_win32])
 AM_CONDITIONAL(OS_WIN32, test "x$native_win32" = "xyes")
 AC_SUBST([ENCHANT_WIN32_RESOURCE])
-
-AC_MSG_CHECKING([for OS X])
-case ${host_os} in
-    *darwin*)
-    check_applespell=yes
-    ;;
-    *)
-    check_applespell=no
-    ;;
-esac
-AC_MSG_RESULT([$check_applespell])
-
 AC_SUBST(SOCKET_LIBS)
 
 # Courtesy of Glib: Ensure MSVC-compatible struct packing convention 
@@ -247,6 +232,17 @@ if test x"$native_win32" = xyes; then
   fi
 fi 
 
+AC_MSG_CHECKING([for macOS])
+case ${host_os} in
+    *darwin*)
+    check_applespell=yes
+    ;;
+    *)
+    check_applespell=no
+    ;;
+esac
+AC_MSG_RESULT([$check_applespell])
+
 dnl ===========================================================================
 
 m4_copy([AC_DEFUN],[glib_DEFUN])
-- 
cgit v1.2.1