File: 0001-Remove-extra-check-for-curl-headers.patch

package info (click to toggle)
php-solr 2.4.0-4
  • links: PTS, VCS
  • area: main
  • in suites: stretch
  • size: 2,420 kB
  • ctags: 2,794
  • sloc: ansic: 26,401; php: 1,152; xml: 1,126; pascal: 4; makefile: 1
file content (33 lines) | stat: -rw-r--r-- 984 bytes parent folder | download | duplicates (2)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
From: =?utf-8?q?Ond=C5=99ej_Sur=C3=BD?= <ondrej@sury.org>
Date: Wed, 1 Feb 2017 10:33:51 +0100
Subject: Remove extra check for curl headers

---
 solr-2.4.0/config.m4 | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/solr-2.4.0/config.m4 b/solr-2.4.0/config.m4
index 965eed5..021b7bc 100644
--- a/solr-2.4.0/config.m4
+++ b/solr-2.4.0/config.m4
@@ -7,19 +7,7 @@ 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])
 
-if test -r $PHP_CURL/include/curl/easy.h; then
-	CURL_DIR=$PHP_CURL
-	AC_MSG_RESULT(curl headers found in $PHP_CURL)
-else
-	AC_MSG_CHECKING(for cURL in default path)
-	for i in /usr/local /usr; do
-	  	if test -r $i/include/curl/easy.h; then
-			CURL_DIR=$i
-			AC_MSG_RESULT(found in $i)
-			break
-	  	fi
-	done
-fi
+CURL_DIR=$PHP_CURL
 
 if test -z "$CURL_DIR"; then
 	AC_MSG_RESULT(not found)