blob: 8f047721e3faecddaf1a2038eeabe8e2139d800d (
plain)
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
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
|
From f3169d68045c7d1db9606856261774b459c0912a Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 8 Oct 2020 09:02:28 +0200
Subject: [PATCH 1/2] always display where header is found
---
config.m4 | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/config.m4 b/config.m4
index b8041bc..89d9eaa 100644
--- a/config.m4
+++ b/config.m4
@@ -11,14 +11,13 @@ if test "$PHP_IP2LOCATION" != "no"; then
# --with-ip2location -> check with-path
SEARCH_PATH="/usr/local /usr /opt/local"
SEARCH_FOR="/include/IP2Location.h"
+ AC_MSG_CHECKING([for ip2location files in default path])
if test -r $PHP_IP2LOCATION/$SEARCH_FOR; then
IP2LOCATION_DIR=$PHP_IP2LOCATION
else # search default path list
- AC_MSG_CHECKING([for ip2location files in default path])
for i in $SEARCH_PATH ; do
if test -r $i/$SEARCH_FOR; then
IP2LOCATION_DIR=$i
- AC_MSG_RESULT([found in $i])
fi
done
fi
@@ -26,6 +25,8 @@ if test "$PHP_IP2LOCATION" != "no"; then
if test -z "$IP2LOCATION_DIR"; then
AC_MSG_RESULT([not found])
AC_MSG_ERROR([Please reinstall the ip2location C library])
+ else
+ AC_MSG_RESULT([found in $IP2LOCATION_DIR])
fi
# --with-ip2location -> add include path
From 174847db69b9806cf501038814fc8ff852845ff7 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 8 Oct 2020 09:02:51 +0200
Subject: [PATCH 2/2] don't track build artefacts
---
.gitignore | 34 ++++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
create mode 100644 .gitignore
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..aa304ab
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,34 @@
+*.lo
+.deps
+.libs/
+.*.swp
+Makefile
+Makefile.fragments
+Makefile.global
+Makefile.objects
+acinclude.m4
+aclocal.m4
+autom4te.cache/
+build/
+config.guess
+config.h
+config.h.in
+config.h.in~
+config.log
+config.nice
+config.status
+config.sub
+configure
+configure.in
+configure.ac
+data/.libs/
+install-sh
+libtool
+ltmain.sh
+ltmain.sh.backup
+missing
+mkinstalldirs
+modules/
+run-tests.php
+run-tests.sh
+*.la
|
