review again library search

Author: remicollet

config.m4

@@ -1,29 +1,54 @@
 PHP_ARG_ENABLE(decimal, whether to enable decimal support,
-[  --enable-decimal           Enable decimal support])
+[  --enable-decimal        Enable decimal support])
+
+PHP_ARG_WITH(libmpdec-path, for libmpdec custom path,
+[  --with-libmpdec-path    libmpdec path], no, no)
 
 if test "$PHP_DECIMAL" != "no"; then
 
-    AC_MSG_CHECKING([for libmpdec files in default path])
-    for i in /usr/$PHP_LIBDIR $(locate -e /usr/**/libmpdec.so); do
-      if test -r $i; then
-        LIBMPDEC_DIR=$(dirname $i)
+    AC_MSG_CHECKING([for libmpdec library in default path])
+    for i in $PHP_LIBMPDEC_PATH /usr /usr/local/; do
+      if test -r $i/$PHP_LIBDIR/libmpdec.$SHLIB_SUFFIX_NAME || test -r $i/$PHP_LIBDIR/libmpdec.a; then
+        LIBMPDEC_DIR=$i/$PHP_LIBDIR
+        AC_MSG_RESULT(found in $LIBMPDEC_DIR)
+        break
+      elif test -r $i/lib/libmpdec.$SHLIB_SUFFIX_NAME || test -r $i/lib/libmpdec.a; then
+        LIBMPDEC_DIR=$i/lib
         AC_MSG_RESULT(found in $LIBMPDEC_DIR)
         break
       fi
     done
 
-    if test -z "$LIBMPDEC_DIR"; then
+    MACHINE_INCLUDES=$($CC -dumpmachine)
+    if test -z "$LIBMPDEC_DIR" && test -r /usr/lib/$MACHINE_INCLUDES/libmpdec.so ; then
+      dnl deb/travis specific case
+      LIBMPDEC_DIR=/usr/lib/$MACHINE_INCLUDES
+      LIBMPDEC_INC=/usr/include/$MACHINE_INCLUDES
+      AC_MSG_RESULT(found in $LIBMPDEC_DIR)
+
+    elif test -z "$LIBMPDEC_DIR"; then
       AC_MSG_RESULT([Could not find libmpdec])
       AC_MSG_ERROR([Please reinstall the libmpdec distribution from http://www.bytereef.org/mpdecimal/])
+
+    else
+      LIBMPDEC_INC=$(dirname $LIBMPDEC_DIR)/include
+      AC_MSG_CHECKING([for libmpdec headers in default path])
+      if test -r $LIBMPDEC_INC/mpdecimal.h; then
+        PHP_ADD_INCLUDE(LIBMPDEC_INC)
+        AC_MSG_RESULT(found in $LIBMPDEC_INC)
+      else
+        AC_MSG_WARN(not found)
+      fi
     fi
 
+
     PHP_CHECK_LIBRARY(mpdec, mpd_version, [
-      PHP_ADD_LIBRARY_WITH_PATH(mpdec, $LIBMPDEC_DIR/$PHP_LIBDIR, DECIMAL_SHARED_LIBADD)
+      PHP_ADD_LIBRARY_WITH_PATH(mpdec, $LIBMPDEC_DIR, DECIMAL_SHARED_LIBADD)
       AC_DEFINE(HAVE_LIBMPDEC, 1, [ ])
     ],[
       AC_MSG_ERROR([Please check your version of libmpdec (~2.4.0)])
     ],[
-      -L$LIBMPDEC_DIR/$PHP_LIBDIR -lm
+      -L$LIBMPDEC_DIR -lm
     ])
 
     PHP_NEW_EXTENSION(decimal, php_decimal.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)