Merge pull request #63 from remicollet/issue-curl-dir

fix libcurl handling

Author: omars44

README.INSTALLATION

@@ -2,7 +2,7 @@
 PHP VERSION Dependencies
 ================================================================================
 
-PHP version 5.3 or later is needed
+PHP version 7.0 or later is needed
 
 ================================================================================
 Extension Dependencies
@@ -16,10 +16,10 @@ Library Dependencies
 
 libxml2 2.6.26 or later is required
 
-libcurl 7.15.0 or later is required
+libcurl 7.15.5 or later is required
 
 ================================================================================
-On UNIX
+On Linux/UNIX
 ================================================================================
 
 As mentioned before, the libxml and curl extensions must be enabled for the Apache Solr extension to be functional.
@@ -30,7 +30,7 @@ To install the Apache Solr extension directly from PECL, please enter the follow
 
 pecl install solr
 
-To compile from source, please follow the following steps
+4A. To compile from source, please follow the following steps
 
 $ phpize
 
@@ -46,9 +46,7 @@ extension=solr.so
 
 Then restart your webserver. For CLI only, you do not have to restart your webserver.
 
-Note :
-
-If your system does not have the minimum version of the libcurl or libxml libraries, you can download the libraries
+4B. If your system does not have the minimum version of the libcurl or libxml libraries, you can download the libraries
 
 and compile them from source into a separate install prefix.
 
@@ -94,7 +92,9 @@ Then you can pass libcurl prefix to the configure script for CURL and LIBXML res
 
 during the configuration phase as shown here :
 
-4B ./configure --enable-solr --with-curl=/root/custom/software --with-libxml-dir=/root/custom/software
+export PKG_CONFIG_PATH=/root/custom/software/lib/pkgconfig
+export PATH=$PATH:/root/custom/software/bin
+./configure --enable-solr
 
 If you already have the latest versions of the libraries then the step listed in 4A alone is sufficient.
 

config.m4

@@ -1,31 +1,31 @@
 dnl config.m4 for the solr extension
 
-dnl Configuring the CURL external library
-dnl This folder is the grand-parent folder of easy.h
-PHP_ARG_WITH(curl, for cURL support, [  --with-curl[=DIR]		SOLR : libcurl install prefix])
-
-PKG_CHECK_MODULES([CURL], [libcurl >= 7.15.0])
-
 PHP_ARG_ENABLE(solr, whether to enable the Solr extension,
 [  --enable-solr         Enable solr support])
 
 PHP_ARG_ENABLE(solr-debug, whether to compile with solr in verbose mode,
 [  --enable-solr-debug          Compile with solr in verbose mode], no, no)
 
-dnl Configuring the LibXML external Library
-if test -z "$PHP_LIBXML_DIR"; then
-  PHP_ARG_WITH(libxml-dir, libxml2 install dir,
-  [  --with-libxml-dir=[DIR]     SOLR : libxml2 install prefix], no, no)
-fi
-
 PHP_ARG_ENABLE(coverage, whether to enable code coverage,
     [  --enable-coverage Enable developer code coverage information],, no)
 
 dnl Setting up the apache Solr extension
 if test "$PHP_SOLR" != "no"; then
 
-	if test "$PHP_CURL" = "no"; then
-        AC_MSG_ERROR([Solr extension requires curl extension, add --with-curl])
+    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+
+    AC_MSG_CHECKING(for libcurl)
+    if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libcurl; then
+      if $PKG_CONFIG libcurl --atleast-version 7.15.5; then
+        CURL_CFLAGS=`$PKG_CONFIG libcurl --cflags`
+        CURL_LIBS=`$PKG_CONFIG libcurl --libs`
+        CURL_VERSON=`$PKG_CONFIG libcurl --modversion`
+        AC_MSG_RESULT(from pkgconfig: version $CURL_VERSON found)
+      else
+        AC_MSG_ERROR(system libcurl must be upgraded to version >= 7.15.5)
+      fi
+    else
+      AC_MSG_ERROR(pkg-config or libcurl not found)
     fi
 
 	PHP_CHECK_LIBRARY(curl,curl_easy_perform,
@@ -34,12 +34,11 @@ if test "$PHP_SOLR" != "no"; then
     ],[
         AC_MSG_ERROR(There is something wrong. Please check config.log for more information.)
     ],[
-        $CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR
+        $CURL_LIBS
     ])
 
-    PHP_ADD_INCLUDE($CURL_DIR/include)
+    PHP_EVAL_INCLINE($CURL_CFLAGS)
     PHP_EVAL_LIBLINE($CURL_LIBS, SOLR_SHARED_LIBADD)
-    PHP_ADD_LIBRARY_WITH_PATH(curl, $CURL_DIR/lib, SOLR_SHARED_LIBADD)
 
 	if test "$PHP_LIBXML" = "no"; then
         AC_MSG_ERROR([Solr extension requires LIBXML extension, add --enable-libxml])
@@ -53,6 +52,8 @@ if test "$PHP_SOLR" != "no"; then
         AC_MSG_ERROR([Solr extension requires json or jsonc support])
     fi
 
+    dnl until PHP 7.3: xml2-config or pkg-config
+    dnl since PHP 7.4: pkg-config only
 	PHP_SETUP_LIBXML(SOLR_SHARED_LIBADD, [
     AC_DEFINE(HAVE_SOLR, 1,[Setting the value of HAVE_SOLR to 1 ])
 

package.xml

@@ -428,10 +428,6 @@ https://github.com/php/pecl-search_engine-solr
     <configureoption default="no"
       name="enable-solr-debug"
       prompt="Enable Solr Debugging (Compiles solr in debug mode)" />
-    <configureoption default="/usr" name="with-curl"
-      prompt="libcURL install prefix" />
-    <configureoption default="/usr"
-      name="with-libxml-dir" prompt="libxml2 install prefix" />
   </extsrcrelease>
 
   <!-- Changes to the extension should be tracked here -->