From 3b3e3c3c928c06955678b86aa623c4a5349c72cd Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Tue, 17 Jan 2012 22:45:42 +0100
Subject: [PATCH] configure: cleanup

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
---
 configure.ac | 64 +++++++++++++++++++++++++++++++---------------------
 1 file changed, 38 insertions(+), 26 deletions(-)

diff --git a/configure.ac b/configure.ac
index 8712973..b4a1e29 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,6 +4,7 @@
 AC_PREREQ([2.67])
 AC_INIT([kconfig-frontends], [m4_esyscmd_s([cat .version])], [nobody@nowhere.org])
 AC_CONFIG_SRCDIR([frontends/conf/conf.c])
+# Use a config.h to avoid brazilions -DHAVE_FOO on compile lines
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_AUX_DIR([scripts])
 
@@ -11,25 +12,15 @@ AC_CONFIG_AUX_DIR([scripts])
 AC_PROG_CXX
 AC_PROG_CC
 AC_PROG_MAKE_SET
-AC_PROG_RANLIB
-
-AM_INIT_AUTOMAKE
-AM_PROG_CC_C_O
-AC_PROG_LEX
-AC_PROG_YACC
-AC_CHECK_PROGS(
-    [GPERF],
-    [gperf])
-AS_IF(
-    [test -z "$GPERF"],
-    [AC_MSG_ERROR([can not find gperf])])
-AC_SUBST([AM_LFLAGS], ["-L -P zconf"])
-AC_SUBST([AM_YFLAGS], ["-t -l -p zconf"])
 
 # Checks for libraries.
+# (none)
 
 # Checks for header files.
-AC_CHECK_HEADERS([ fcntl.h libintl.h limits.h locale.h stdlib.h string.h sys/time.h unistd.h ])
+AC_HEADER_STDC
+# The folowing AC_CHECK_HEADERS was a single big line
+AC_CHECK_HEADERS([ fcntl.h libintl.h limits.h locale.h ])
+AC_CHECK_HEADERS([ stdlib.h string.h sys/time.h unistd.h ])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_HEADER_STDBOOL
@@ -39,25 +30,41 @@ AC_TYPE_SIZE_T
 # Checks for library functions.
 AC_FUNC_MALLOC
 AC_FUNC_REALLOC
-AC_CHECK_FUNCS([ bzero gettimeofday memmove memset mkdir regcomp setlocale strcasecmp strchr strcspn strdup strncasecmp strpbrk strrchr strspn strtol uname ])
+AC_FUNC_ALLOCA
+# The following AC_CHECK_FUNCS was a single big line
+AC_CHECK_FUNCS([ bzero memmove memset ])
+AC_CHECK_FUNCS([ strcasecmp strchr strcspn strdup strncasecmp strpbrk strrchr strspn strtol ])
+AC_CHECK_FUNCS([ gettimeofday mkdir regcomp setlocale uname ])
+
+# End of the autoscan-detected stuff
+#---------------------------------------------------------------------------
 
 #----------------------------------------
-AC_C_INLINE
-AC_HEADER_STDC
-AC_FUNC_MALLOC
-AC_FUNC_REALLOC
-AC_FUNC_ALLOCA
+# Some program checks
+AC_PROG_RANLIB
+AC_PROG_LEX
+AC_PROG_YACC
+AC_CHECK_PROGS(
+    [GPERF],
+    [gperf])
+AS_IF(
+    [test -z "$GPERF"],
+    [AC_MSG_ERROR([can not find gperf])])
+AC_SUBST([AM_LFLAGS], ["-L -P zconf"])
+AC_SUBST([AM_YFLAGS], ["-t -l -p zconf"])
 
 #----------------------------------------
 # Check for gettext, for the kconfig frontends
 AC_SUBST([gettext])
 AC_CHECK_HEADERS(
     [libintl.h],
-    [ac_ct_gettext_hdr=$ac_header; break])
+    [ac_ct_gettext_hdr=$ac_header; break],
+    [AC_MSG_WARN([libintl is missing, frontends will not be localised])])
 AS_IF(
     [test -n "$ac_ct_gettext_hdr"],
     [AC_CHECK_DECL(
-        [gettext],[gettext=y],,
+        [gettext],[gettext=y],
+        [AC_MSG_WARN([gettext is missing, frontends will not be localised])],
         [#include <$ac_ct_gettext_hdr>])])
 
 #----------------------------------------
@@ -68,17 +75,22 @@ AC_CHECK_HEADERS(
     [CURSES_LOC=$ac_header; break])
 AS_IF(
     [test -z "$CURSES_LOC"],
-    [AC_MSG_ERROR([could not find curses header, required for the kconfig frontends])])
+    [AC_MSG_ERROR([could not find curses headers])])
 AC_SEARCH_LIBS(
     [initscr],
     [ncursesw ncurses curses],
     [ac_ct_curses_lib_found=yes; break])
 AS_IF(
     [test -z "$ac_ct_curses_lib_found"],
-    [AC_MSG_ERROR([could not find curses library, required for the kconfig frontends])])
-
+    [AC_MSG_ERROR([could not find curses library])])
 
+#----------------------------------------
+# Prepare automake
+AM_INIT_AUTOMAKE
+AM_PROG_CC_C_O
 
+#----------------------------------------
+# Finalise
 AC_CONFIG_FILES([
     Makefile
     lxdialog/Makefile
-- 
2.39.5