From 2b06ea45c4a191cabdbe4758746bf7fd63b85e28 Mon Sep 17 00:00:00 2001
From: Matias De lellis <mati86dl@gmail.com>
Date: Sun, 19 Apr 2020 19:26:22 -0300
Subject: [PATCH] Improve messages when configure build.

---
 config.m4   | 88 +++++++++++++++++++++++++++++++----------------------
 pdlib.cc    |  2 +-
 php_pdlib.h |  3 +-
 3 files changed, 54 insertions(+), 39 deletions(-)

diff --git a/config.m4 b/config.m4
index 3cf7534..0d37ad4 100644
--- a/config.m4
+++ b/config.m4
@@ -1,10 +1,3 @@
-dnl $Id$
-dnl config.m4 for extension pdlib
-
-dnl Comments in this file start with the string 'dnl'.
-dnl Remove where necessary. This file will not work
-dnl without editing.
-
 if test -z "$PHP_DEBUG"; then
     AC_ARG_ENABLE(debug,
     [   --enable-debug          compile with debugging symbols],[
@@ -14,44 +7,65 @@ if test -z "$PHP_DEBUG"; then
 fi
 
 PHP_ARG_WITH(pdlib, for pdlib support,
-dnl Make sure that the comment is aligned:
 [  --with-pdlib             Include pdlib support])
 
-if test "$PHP_PDLIB" != "no"; then
-  dnl using C++11
-  CXXFLAGS="-std=c++11"
-  PHP_REQUIRE_CXX()
-  PHP_ADD_LIBRARY(stdc++, 1, PDLIB_SHARED_LIBADD)
-  PHP_SUBST(PDLIB_SHARED_LIBADD)
+dnl using C++11
+CXXFLAGS="-std=c++11"
+PHP_REQUIRE_CXX()
+PHP_ADD_LIBRARY(stdc++, 1, PDLIB_SHARED_LIBADD)
+PHP_SUBST(PDLIB_SHARED_LIBADD)
 
-  pdlib_src_files="
+PHP_PDLIB_SOURCES="\
     pdlib.cc \
     src/chinese_whispers.cc \
     src/face_detection.cc \
     src/face_landmark_detection.cc \
     src/face_recognition.cc \
     src/cnn_face_detection.cc \
-    src/vector.cc"
+    src/vector.cc \
+"
 
-  AC_MSG_CHECKING(for pkg-config)
-  if test ! -f "$PKG_CONFIG"; then
-        PKG_CONFIG=`which pkg-config`
-  fi
-
-  if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists dlib-1; then
-     if $PKG_CONFIG dlib-1 --atleast-version 19.00; then
-        LIBDLIB_CFLAGS=`$PKG_CONFIG dlib-1 --cflags`
-        LIBDLIB_LIBDIR=`$PKG_CONFIG dlib-1 --libs`
-        LIBDLIB_VERSON=`$PKG_CONFIG dlib-1 --modversion`
-        AC_MSG_RESULT(from pkgconfig: dlib version $LIBDLIB_VERSON)
-     else
-        AC_MSG_ERROR(system dlib is too old: version 19.00 required)
-     fi
-  else
-     AC_MSG_ERROR(pkg-config not found)
-  fi
-  PHP_EVAL_LIBLINE($LIBDLIB_LIBDIR, PDLIB_SHARED_LIBADD)
-  PHP_EVAL_INCLINE($LIBDLIB_CFLAGS)
-
-  PHP_NEW_EXTENSION(pdlib, $pdlib_src_files, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
+AC_MSG_CHECKING(for pkg-config)
+if test ! -f "$PKG_CONFIG"; then
+    PKG_CONFIG=`which pkg-config`
 fi
+
+if test -f "$PKG_CONFIG"; then
+    AC_MSG_RESULT(found)
+
+    AC_MSG_CHECKING(for dlib-1)
+    if $PKG_CONFIG --exists dlib-1; then
+        if $PKG_CONFIG dlib-1 --atleast-version 19.00; then
+            LIBDLIB_CFLAGS=`$PKG_CONFIG dlib-1 --cflags`
+            LIBDLIB_LIBDIR=`$PKG_CONFIG dlib-1 --libs`
+            LIBDLIB_VERSON=`$PKG_CONFIG dlib-1 --modversion`
+            AC_MSG_RESULT(from pkgconfig: dlib version $LIBDLIB_VERSON)
+        else
+            AC_MSG_ERROR(system dlib is too old: version 19.00 required)
+        fi
+    else
+        AC_MSG_ERROR(dlib-1 not found)
+    fi
+else
+    AC_MSG_ERROR(pkg-config not found)
+fi
+
+PHP_EVAL_LIBLINE($LIBDLIB_LIBDIR, PDLIB_SHARED_LIBADD)
+PHP_EVAL_INCLINE($LIBDLIB_CFLAGS)
+
+PHP_NEW_EXTENSION(pdlib, $PHP_PDLIB_SOURCES, $ext_shared, , -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
+
+AC_CONFIG_COMMANDS_POST([
+    echo ""
+    echo "Build configuration for PDlib v1.0.2 done correctly."
+    echo ""
+    echo "  CFLAGS       : $CFLAGS"
+    echo "  LDFLAGS      : $LDFLAGS"
+    echo "  LIBDIR:      : $LIBDLIB_LIBDIR"
+    echo "  LIBADD:      : $PDLIB_SHARED_LIBADD"
+    echo "  CFLAGS:      : $LIBDLIB_CFLAGS"
+    echo ""
+    echo "Please submit bug reports at:"
+    echo "  https://github.com/matiasdelellis/pdlib/issues"
+    echo ""
+])
\ No newline at end of file
diff --git a/pdlib.cc b/pdlib.cc
index f848407..5c18b52 100644
--- a/pdlib.cc
+++ b/pdlib.cc
@@ -275,7 +275,7 @@ const zend_function_entry pdlib_functions[] = {
  */
 zend_module_entry pdlib_module_entry = {
 	STANDARD_MODULE_HEADER,
-	"pdlib",
+	PHP_PDLIB_NAME,
 	pdlib_functions,
 	PHP_MINIT(pdlib),
 	PHP_MSHUTDOWN(pdlib),
diff --git a/php_pdlib.h b/php_pdlib.h
index 5e61714..73b2799 100644
--- a/php_pdlib.h
+++ b/php_pdlib.h
@@ -31,7 +31,8 @@ extern "C" {
 extern zend_module_entry pdlib_module_entry;
 #define phpext_pdlib_ptr &pdlib_module_entry
 
-#define PHP_PDLIB_VERSION "1.0.2" /* Replace with version number for your extension */
+#define PHP_PDLIB_NAME "pdlib"
+#define PHP_PDLIB_VERSION "1.0.2"
 
 #ifdef PHP_WIN32
 #	define PHP_PDLIB_API __declspec(dllexport)