From aa6b7825d80fdfacbb7a0b996e275a29efe42405 Mon Sep 17 00:00:00 2001
From: gambas <g4mba5@gmail.com>
Date: Sat, 29 Sep 2018 04:40:24 +0200
Subject: [PATCH] Do not disable 'gb.crypt' if libcrypt is not found. Let's
 suppose it is located in the C system library, as on some systems based on
 musl and busybox.

[CONFIGURATION]
* NEW: Fix some messages

[GB.CRYPT]
* NEW: Do not disable the component if libcrypt is not found. Let's suppose it is located in the C system library, as on some systems.
---
 acinclude.m4          |  2 +-
 gb.crypt/configure.ac | 10 ++++++++--
 main/configure.ac     |  4 ++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 55737f68b..b6069ec90 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -928,7 +928,7 @@ AC_DEFUN([GB_COMPONENT_PKG_CONFIG],
       touch DISABLED.$3
     fi
 
-    AC_MSG_RESULT([** NOT FOUND **])
+    AC_MSG_RESULT(no)
 
     for pkgcmp in $5
     do
diff --git a/gb.crypt/configure.ac b/gb.crypt/configure.ac
index 7191d00e1..35f1a3283 100644
--- a/gb.crypt/configure.ac
+++ b/gb.crypt/configure.ac
@@ -11,8 +11,14 @@ GB_COMPONENT(
   crypt, CRYPT, gb.crypt, [src],
   [],
   [GB_FIND(libcrypt.$SHLIBEXT, $prefix /usr/local /usr, lib)],
-  [-lcrypt])
- 
+  [-lcrypt],
+  [],
+  [Cannot find 'libcrypt' library. It may be merged inside the system C library, so you can ignore that warning...])
+
+dnl ---- Remove DISABLED file that could have been generated before
+
+rm -f DISABLED DISABLED.*
+
 AC_OUTPUT( \
 Makefile \
 src/Makefile \
diff --git a/main/configure.ac b/main/configure.ac
index bd19bd3b8..662e165cb 100644
--- a/main/configure.ac
+++ b/main/configure.ac
@@ -36,7 +36,7 @@ GB_COMPONENT(
   [GB_FIND(libiconv.$SHLIBEXT, /opt/local /usr/local /usr, lib)],
   [-liconv],
   [],
-  [Cannot find 'libiconv' library. It may be located inside the system C library, so you can ignore that warning...])
+  [Cannot find 'libiconv' library. It may be merged inside the system C library, so you can ignore that warning...])
 
 dnl ---- Remove DISABLED file that could have been generated before
 
@@ -52,7 +52,7 @@ GB_COMPONENT(
   [GB_FIND(libgettextlib.$SHLIBEXT, /opt/local /usr/local /usr, lib)],
   [-lgettextlib],
   [],
-  [Cannot find 'libgettextlib' library. It may be located inside the system C library, so you can ignore that warning...])
+  [Cannot find 'libgettextlib' library. It may be merged inside the system C library, so you can ignore that warning...])
   
 fi