projects
/
m6w6
/
ext-http
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
|
github
raw
|
patch
|
inline
| side by side (parent:
589a7cc
)
more tweaks
author
Michael Wallner
<mike@php.net>
Tue, 8 Nov 2005 23:00:16 +0000
(23:00 +0000)
committer
Michael Wallner
<mike@php.net>
Tue, 8 Nov 2005 23:00:16 +0000
(23:00 +0000)
Makefile.frag
patch
|
blob
|
history
config.m4
patch
|
blob
|
history
diff --git
a/Makefile.frag
b/Makefile.frag
index 480198627ffed62911ab0155654d21e13e024552..f019ecc059a561d858e39b8dda0fc2684438fd4b 100644
(file)
--- a/
Makefile.frag
+++ b/
Makefile.frag
@@
-1,5
+1,9
@@
+# vim: noet ts=1 sw=1
+
phpincludedir=$(prefix)/include/php
phpincludedir=$(prefix)/include/php
+install-http: install install-http-headers
+
install-http-headers:
@echo "Installing HTTP headers: $(INSTALL_ROOT)$(phpincludedir)/ext/http/"
@$(mkinstalldirs) $(INSTALL_ROOT)$(phpincludedir)/ext/http
install-http-headers:
@echo "Installing HTTP headers: $(INSTALL_ROOT)$(phpincludedir)/ext/http/"
@$(mkinstalldirs) $(INSTALL_ROOT)$(phpincludedir)/ext/http
@@
-17,6
+21,3
@@
install-http-headers:
fi \
done;
fi \
done;
-# mini hack
-install: $(all_targets) $(install_targets) install-http-headers
-
diff --git
a/config.m4
b/config.m4
index ff1f707aab3d0f413dd1235ea628bc788082b77a..aa63ea43e7425410b4a650fa42e92eafc4199c4b 100644
(file)
--- a/
config.m4
+++ b/
config.m4
@@
-84,20
+84,20
@@
dnl ----
AC_MSG_CHECKING([for SSL support in libcurl])
CURL_SSL=`$CURL_CONFIG --features | $EGREP SSL`
AC_MSG_CHECKING([for SSL support in libcurl])
CURL_SSL=`$CURL_CONFIG --features | $EGREP SSL`
- if test "$CURL_SSL" =
=
"SSL"; then
+ if test "$CURL_SSL" = "SSL"; then
AC_MSG_RESULT([yes])
AC_DEFINE([HTTP_HAVE_SSL], [1], [ ])
AC_MSG_CHECKING([for SSL library used])
CURL_SSL_FLAVOUR=
for i in $CURL_LIBS; do
AC_MSG_RESULT([yes])
AC_DEFINE([HTTP_HAVE_SSL], [1], [ ])
AC_MSG_CHECKING([for SSL library used])
CURL_SSL_FLAVOUR=
for i in $CURL_LIBS; do
- if test "$i" =
=
"-lssl"; then
+ if test "$i" = "-lssl"; then
CURL_SSL_FLAVOUR="openssl"
AC_MSG_RESULT([openssl])
AC_DEFINE([HTTP_HAVE_OPENSSL], [1], [ ])
AC_CHECK_HEADERS([openssl/crypto.h])
break
CURL_SSL_FLAVOUR="openssl"
AC_MSG_RESULT([openssl])
AC_DEFINE([HTTP_HAVE_OPENSSL], [1], [ ])
AC_CHECK_HEADERS([openssl/crypto.h])
break
- elif test "$i" =
=
"-lgnutls"; then
+ elif test "$i" = "-lgnutls"; then
CURL_SSL_FLAVOUR="gnutls"
AC_MSG_RESULT([gnutls])
AC_DEFINE([HTTP_HAVE_GNUTLS], [1], [ ])
CURL_SSL_FLAVOUR="gnutls"
AC_MSG_RESULT([gnutls])
AC_DEFINE([HTTP_HAVE_GNUTLS], [1], [ ])