Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

sync

  • Loading branch information...
commit 18ed4fa205c5f76cc90169b9ac5b9fb0ab78e122 1 parent 86c41a0
stefano casazza authored
Showing with 3,533 additions and 2,826 deletions.
  1. +1 −1  Makefile.am
  2. +16 −16 Makefile.in
  3. +17 −13 README.html
  4. +15 −13 README.md
  5. +271 −224 configure
  6. +119 −124 configure.in
  7. +39 −0 configure_h.awk
  8. +33 −0 configure_log.awk
  9. +15 −15 contrib/HCSP/Makefile.in
  10. +15 −15 contrib/Makefile.in
  11. +15 −15 contrib/RSIGN/Makefile.in
  12. +15 −15 contrib/signer/Makefile.in
  13. +15 −15 doc/Makefile.in
  14. +15 −15 examples/IR/Makefile.in
  15. +15 −15 examples/Makefile.in
  16. +15 −15 examples/PEC_log/Makefile.in
  17. +15 −15 examples/XAdES/Makefile.in
  18. +1 −1  examples/XAdES/client.cpp
  19. +15 −15 examples/csp/Makefile.in
  20. +1 −1  examples/csp/cspclient.cpp
  21. +1 −1  examples/csp/cspclient_rpc.cpp
  22. +15 −15 examples/doc_classifier/Makefile.in
  23. +15 −15 examples/doc_parse/Makefile.in
  24. +15 −15 examples/download_accelerator/Makefile.in
  25. +15 −15 examples/form_completion/Makefile.in
  26. +15 −15 examples/http_header/Makefile.in
  27. +2 −2 examples/http_header/OtpAuthToken.cpp
  28. +15 −15 examples/lcsp/Makefile.in
  29. +15 −15 examples/lrp_session/Makefile.in
  30. +15 −15 examples/rsign/Makefile.in
  31. +1 −1  examples/rsign/rsignclient.cpp
  32. +1 −1  examples/rsign/rsignclient_rpc.cpp
  33. +15 −15 examples/simple_client_server/Makefile.in
  34. +2 −2 examples/simple_client_server/client.cpp
  35. +1 −1  examples/simple_client_server/server.cpp
  36. +15 −15 examples/test_manager/Makefile.in
  37. +15 −15 examples/uclient/Makefile.in
  38. +2 −2 examples/uclient/uclient.cfg.default
  39. +1 −1  examples/uclient/uclient.cpp
  40. +15 −15 examples/userver/Makefile.in
  41. +5 −7 examples/userver/userver.cfg.default
  42. +1 −1  examples/userver/userver.cpp
  43. +15 −15 examples/workflow/Makefile.in
  44. +15 −15 examples/xml2txt/Makefile.in
  45. +15 −15 include/Makefile.in
  46. +15 −15 include/ulib/Makefile.in
  47. +10 −10 include/ulib/all.h
  48. +2 −2 include/ulib/base/bottom.h
  49. +15 −9 include/ulib/base/utility.h
  50. +1 −1  include/ulib/base/win32/system.h
  51. 0  include/ulib/{ → base}/zip/ziptool.h
  52. +0 −1  include/ulib/dynamic/dynamic.h
  53. +4 −4 include/ulib/event/event_fd.h
  54. +4 −4 include/ulib/event/event_time.h
  55. +1 −1  include/ulib/file.h
  56. +4 −2 include/ulib/internal/chttp.h
  57. +1 −1  include/ulib/internal/common.h
  58. +78 −12 include/ulib/internal/config.h.in
  59. +1 −1  include/ulib/internal/csp_interface.h
  60. +1 −1  include/ulib/log.h
  61. +2 −2 include/ulib/net/client/client.h
  62. +4 −2 include/ulib/net/client/ftp.h
  63. +1 −1  include/ulib/net/client/http.h
  64. +3 −3 include/ulib/net/client/imap.h
  65. +3 −1 include/ulib/net/client/pop3.h
  66. +3 −1 include/ulib/net/client/smtp.h
  67. +8 −4 include/ulib/net/ipaddress.h
  68. +3 −3 include/ulib/net/server/client_image.h
  69. +1 −1  include/ulib/net/server/client_image_skeleton.h
  70. +5 −4 include/ulib/net/server/server.h
  71. +1 −1  include/ulib/net/socket.h
  72. +2 −2 include/ulib/notifier.h
  73. +1 −1  include/ulib/url.h
  74. +5 −5 include/ulib/utility/services.h
  75. +12 −7 include/ulib/utility/string_ext.h
  76. +7 −6 include/ulib/utility/uhttp.h
  77. +3 −1 include/ulib/zip/zip.h
  78. +15 −15 m4/Makefile.in
  79. +59 −59 m4/ac_check_package.m4
  80. +6 −2 m4/ac_compilation_options.m4
  81. +15 −15 src/ulib/Makefile.in
  82. +3 −3 src/ulib/all_c.c
  83. +14 −14 src/ulib/all_cpp.cpp
  84. +2 −2 src/ulib/base/base.c
  85. +209 −76 src/ulib/base/utility.c
  86. +1 −1  src/ulib/base/zip/Makefile.am
  87. +1 −1  src/ulib/base/zip/inflate.c
  88. +1 −1  src/ulib/base/zip/ziptool.c
  89. +1 −1  src/ulib/curl/curl.cpp
  90. +1 −1  src/ulib/event/event_time.cpp
  91. +7 −6 src/ulib/file.cpp
  92. +2 −2 src/ulib/internal/common.cpp
  93. +2 −2 src/ulib/internal/memory_pool.cpp
  94. +15 −15 src/ulib/lemon/Makefile.in
  95. +4 −4 src/ulib/log.cpp
  96. +2 −2 src/ulib/mime/multipart.cpp
  97. +5 −5 src/ulib/net/client/client.cpp
  98. +2 −2 src/ulib/net/client/ftp.cpp
  99. +2 −2 src/ulib/net/client/http.cpp
  100. +2 −2 src/ulib/net/client/imap.cpp
  101. +2 −2 src/ulib/net/client/pop3.cpp
  102. +2 −2 src/ulib/net/client/smtp.cpp
  103. +54 −7 src/ulib/net/ipaddress.cpp
  104. +4 −4 src/ulib/net/server/client_image.cpp
  105. +15 −15 src/ulib/net/server/plugin/Makefile.in
  106. +1 −1  src/ulib/net/server/plugin/mod_fcgi.cpp
  107. +15 −15 src/ulib/net/server/plugin/mod_geoip/Makefile.in
  108. +4 −4 src/ulib/net/server/plugin/mod_http.cpp
  109. +2 −0  src/ulib/net/server/plugin/mod_nocat.cpp
  110. +1 −1  src/ulib/net/server/plugin/mod_proxy.cpp
  111. +1 −1  src/ulib/net/server/plugin/mod_scgi.cpp
  112. +15 −15 src/ulib/net/server/plugin/mod_shib/Makefile.in
  113. +1 −1  src/ulib/net/server/plugin/mod_ssi.cpp
  114. +15 −15 src/ulib/net/server/plugin/page_speed/Makefile.in
  115. +15 −15 src/ulib/net/server/plugin/usp/Makefile.in
  116. +15 −15 src/ulib/net/server/plugin/v8/Makefile.in
  117. +164 −135 src/ulib/net/server/server.cpp
  118. +2 −2 src/ulib/net/socket.cpp
  119. +12 −12 src/ulib/net/socket_address.cpp
  120. +2 −2 src/ulib/net/tcpsocket.cpp
  121. +15 −15 src/ulib/notifier.cpp
  122. +198 −106 src/ulib/options.cpp
  123. +2 −2 src/ulib/string.cpp
  124. +1 −1  src/ulib/timer.cpp
  125. +2 −2 src/ulib/tokenizer.cpp
  126. +15 −6 src/ulib/url.cpp
  127. +5 −5 src/ulib/utility/services.cpp
  128. +6 −5 src/ulib/utility/socket_ext.cpp
  129. +118 −16 src/ulib/utility/string_ext.cpp
  130. +83 −70 src/ulib/utility/uhttp.cpp
  131. +15 −15 tests/Makefile.in
  132. +15 −15 tests/base/Makefile.in
  133. +1 −1  tests/base/test_zip.c
  134. +15 −15 tests/contrib/Makefile.in
  135. +15 −15 tests/debug/Makefile.in
  136. +2 −2 tests/examples/CSP/DB_CA/rsignclient.cfg
  137. +2 −2 tests/examples/FIRENZE_ssl.cfg
  138. +2 −2 tests/examples/FIRENZE_tcp.cfg
  139. +1 −1  tests/examples/IR_WEB.cfg
  140. +15 −15 tests/examples/Makefile.in
  141. +2 −2 tests/examples/RA.cfg
  142. +1 −1  tests/examples/RA/userver/etc/RA.cfg
  143. +2 −2 tests/examples/RA/userver/etc/RA.cfg.old
  144. +2 −2 tests/examples/SIENA_ssl.cfg
  145. +2 −2 tests/examples/SIENA_tcp.cfg
  146. +1 −1  tests/examples/TSA/CA/tsaserial
  147. BIN  tests/examples/TSA/TSA/.rnd
  148. +2 −2 tests/examples/WI-AUTH.cfg
  149. +6 −6 tests/examples/XAdES/XAdES-API.cfg
  150. +2 −2 tests/examples/XAdES/XAdESclient.cfg
  151. +2 −2 tests/examples/attack_client.cfg
  152. +1 −1  tests/examples/benchmark/benchmarking.cfg
  153. +1 −1  tests/examples/benchmark/benchmarking_ssl.cfg
  154. +2 −2 tests/examples/cspclient.cfg
  155. +2 −2 tests/examples/cspclient_rpc.cfg
  156. +2 −2 tests/examples/inp/client.cf
  157. +1 −1  tests/examples/inp/http/all1.inp
  158. +2 −2 tests/examples/inp/server.cf
  159. +3 −3 tests/examples/nocat.cfg
  160. +41 −23 tests/examples/nocat/cgi-bin/index.sh
  161. +5 −5 tests/examples/nocat/etc/nodog.conf
  162. +6 −2 tests/examples/nocat/etc/nodog_index.tmpl
  163. +2 −2 tests/examples/nocat/etc/uclient.conf
  164. BIN  tests/examples/nocat/images/partecipaa20venti.png
  165. +658 −658 tests/examples/ok/web_server.ok
  166. +336 −336 tests/examples/ok/web_server_ssl.ok
  167. +2 −2 tests/examples/rsignclient.cfg
  168. +2 −2 tests/examples/rsignclient_rpc.cfg
  169. +2 −2 tests/examples/tsa_http.cfg
  170. +2 −2 tests/examples/uclient.cfg
  171. +2 −2 tests/examples/userver.cfg
  172. +1 −1  tests/examples/usp.cfg
  173. +1 −1  tests/examples/web_server.cfg
  174. +2 −2 tests/examples/web_server_multiclient.cfg
  175. +1 −1  tests/examples/web_server_ruby.cfg
  176. +1 −1  tests/examples/web_server_yii.cfg
  177. +3 −3 tests/examples/web_socket.cfg
  178. +1 −1  tests/examples/web_stream.cfg
  179. +9 −9 tests/examples/wi-auth/etc/environment.conf
  180. +15 −15 tests/ulib/Makefile.in
  181. +2 −2 tests/ulib/README
  182. BIN  tests/ulib/inp/test.db
  183. +3 −3 tests/ulib/test_entity.cpp
  184. +6 −6 tests/ulib/test_memory_pool.cpp
  185. +1 −1  tests/ulib/test_services.cpp
  186. +1 −1  tests/ulib/test_smtp.cpp
  187. +45 −3 tests/ulib/test_string.cpp
  188. BIN  win32/dll/debug/libulib_g-1-1-0-1.dll
  189. BIN  win32/plugin/debug/HCSP.dll
  190. BIN  win32/plugin/debug/mod_echo.dll
  191. BIN  win32/plugin/debug/mod_fcgi.dll
  192. BIN  win32/plugin/debug/mod_http.dll
  193. BIN  win32/plugin/debug/mod_nocat.dll
  194. BIN  win32/plugin/debug/mod_rpc.dll
  195. BIN  win32/plugin/debug/mod_scgi.dll
  196. BIN  win32/plugin/debug/mod_soap.dll
  197. BIN  win32/plugin/debug/mod_socket.dll
  198. BIN  win32/plugin/debug/mod_ssi.dll
  199. BIN  win32/plugin/debug/mod_stream.dll
  200. BIN  win32/plugin/debug/mod_tsa.dll
  201. BIN  win32/sbin/debug/i686-pc-mingw32-uclient.exe
  202. BIN  win32/sbin/debug/i686-pc-mingw32-userver_ssl.exe
  203. BIN  win32/sbin/debug/i686-pc-mingw32-userver_tcp.exe
  204. BIN  win32/sbin/debug/i686-pc-mingw32-usp_translator.exe
2  Makefile.am
View
@@ -5,7 +5,7 @@ ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = autoconf cdb configure.help TODO LICENSE* README* *.spec* \
ULib.m4 rpm.sh rpmpkgreq.lst rpmpkgreq.lst.suse openwrt \
- doc/Doxyfile doc/benchmark doc/readme.txt shtool
+ doc/Doxyfile doc/benchmark doc/readme.txt shtool *.awk
MAINTAINERCLEANFILES = configure aclocal.m4 libtool Makefile.in Makefile INSTALL
32 Makefile.in
View
@@ -194,22 +194,7 @@ FTPDIR = @FTPDIR@
GENERIC_LIBRARY_VERSION = @GENERIC_LIBRARY_VERSION@
GETOPT_LIBS = @GETOPT_LIBS@
GREP = @GREP@
-HAVE_CURL = @HAVE_CURL@
-HAVE_DBI = @HAVE_DBI@
-HAVE_EXPAT = @HAVE_EXPAT@
-HAVE_LDAP = @HAVE_LDAP@
-HAVE_LIBEVENT = @HAVE_LIBEVENT@
-HAVE_LIBUUID = @HAVE_LIBUUID@
-HAVE_LIBXML2 = @HAVE_LIBXML2@
-HAVE_LIBZ = @HAVE_LIBZ@
-HAVE_MAGIC = @HAVE_MAGIC@
-HAVE_MYSQL = @HAVE_MYSQL@
-HAVE_PAGE_SPEED = @HAVE_PAGE_SPEED@
-HAVE_PCRE = @HAVE_PCRE@
-HAVE_SSH = @HAVE_SSH@
-HAVE_SSL = @HAVE_SSL@
HAVE_SSL_TS = @HAVE_SSL_TS@
-HAVE_V8 = @HAVE_V8@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -266,6 +251,21 @@ ULIB_CPPFLAGS = @ULIB_CPPFLAGS@
ULIB_CXXFLAGS = @ULIB_CXXFLAGS@
ULIB_LDFLAGS = @ULIB_LDFLAGS@
ULIB_LIBS = @ULIB_LIBS@
+USE_LIBCURL = @USE_LIBCURL@
+USE_LIBDBI = @USE_LIBDBI@
+USE_LIBEVENT = @USE_LIBEVENT@
+USE_LIBEXPAT = @USE_LIBEXPAT@
+USE_LIBLDAP = @USE_LIBLDAP@
+USE_LIBMAGIC = @USE_LIBMAGIC@
+USE_LIBMYSQL = @USE_LIBMYSQL@
+USE_LIBPCRE = @USE_LIBPCRE@
+USE_LIBSSH = @USE_LIBSSH@
+USE_LIBSSL = @USE_LIBSSL@
+USE_LIBUUID = @USE_LIBUUID@
+USE_LIBV8 = @USE_LIBV8@
+USE_LIBXML2 = @USE_LIBXML2@
+USE_LIBZ = @USE_LIBZ@
+USE_PAGE_SPEED = @USE_PAGE_SPEED@
VERSION = @VERSION@
WINDRES = @WINDRES@
XLEX = @XLEX@
@@ -335,7 +335,7 @@ AUTOMAKE_OPTIONS = no-dependencies ## dist-shar dist-zip
ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = autoconf cdb configure.help TODO LICENSE* README* *.spec* \
ULib.m4 rpm.sh rpmpkgreq.lst rpmpkgreq.lst.suse openwrt \
- doc/Doxyfile doc/benchmark doc/readme.txt shtool
+ doc/Doxyfile doc/benchmark doc/readme.txt shtool *.awk
MAINTAINERCLEANFILES = configure aclocal.m4 libtool Makefile.in Makefile INSTALL
SUBDIRS = include src/ulib $(am__append_1) examples contrib tests
30 README.html
View
@@ -41,7 +41,7 @@
<li>Browser cache management (headers: If-Modified-Since/Last-modified).</li>
<li>Chunk-encoding transfers support.</li>
<li>HTTP multi-range request support.</li>
-<li>Memory caching of document root for (small) static pages with smart deflate compression and CSS/JS reduction.</li>
+<li>Memory caching of document root for (small) static pages with smart gzip compression and CSS/JS reduction.</li>
<li>Support for automatic update of caching document root with inotify (on Linux).</li>
<li>Support for pipelining.</li>
<li>Support for virtual hosts (also with SSL).</li>
@@ -56,14 +56,12 @@
<li>Support for <a href="http://json.org/JSONRequest.html">JSONRequest</a>.</li>
<li>Accept HTTP uploads up to 4 GB without increasing memory usage.</li>
<li>Support for upload progress via USP (ULib Servlet Page).</li>
-<li>General <a href="http://it.wikipedia.org/wiki/Common_Gateway_Interface">CGI</a> support (run any CGI script) with automatic output compression (using deflate method).</li>
+<li>General <a href="http://it.wikipedia.org/wiki/Common_Gateway_Interface">CGI</a> support (run any CGI script) with automatic output compression (using gzip method).</li>
<li>CGI support for shell script processes (with automatic management of form and cookie).</li>
<li>CGI support for the X-Sendfile feature and also supports X-Accel-Redirect headers transparently.</li>
<li>Support for minify HTML CGI output with wrapping <a href="http://code.google.com/speed/page-speed/download.html#pagespeed-sdk">google page speed SDK</a>.</li>
<li>Support for running JavaScript code with wrapping <a href="http://code.google.com/apis/v8/intro.html">google V8 JavaScript Engine</a>.</li>
-<li>Support for <a href="http://www.phpmotionwiz.com/what-is-pseudo-streaming">HTTP pseudo-streaming</a> for FLV video.</li>
-<li>Support for <a href="https://developer.mozilla.org/en/Security/HTTP_Strict_Transport_Security">HTTP Strict Transport Security</a>.</li>
-<li>Support for <a href="http://cleverlogic.net/articles/kochure">HTTP Session Hijacking mitigation</a>.</li>
+<li><a href="http://www.phpmotionwiz.com/what-is-pseudo-streaming">HTTP pseudo-streaming</a> for FLV video managed transparently.</li>
<li><a href="http://bellard.org/tcc/">C Servlet Support</a> with libtcc (if available) as a backend for dynamic code generation (experimental).</li>
<li>Support for Windows (without preforking), precompiled binaries are available <a href="https://github.com/stefanocasazza/ULib/tree/master/win32">here</a>.</li>
<li>Requests cut in phases for modular architecture (apache-like).</li>
@@ -85,6 +83,13 @@
<li><code>mod_stream</code> : simple streaming support (experimental).</li>
<li><code>mod_socket</code> : <a href="http://dev.w3.org/html5/websockets">Web Socket</a> application framework (experimental).</li>
</ul></li>
+<li>Security protection :
+<ul>
+<li><a href="http://cleverlogic.net/articles/kochure">HTTP Session Hijacking</a> mitigation.</li>
+<li><a href="http://lwn.net/Articles/474365/">Algorithmic Complexity Attacks</a> prevention by randomizing hash seed.</li>
+<li><a href="http://en.wikipedia.org/wiki/DNS_rebinding">DNS rebinding</a> prevention by RFC1918 filtering and Host header validation.</li>
+<li>support for <a href="https://developer.mozilla.org/en/Security/HTTP_Strict_Transport_Security">HTTP Strict Transport Security</a>.</li>
+</ul></li>
</ul>
<h2>Benchmarking</h2>
@@ -102,7 +107,7 @@
<h2><a href="https://github.com/stefanocasazza/ULib/tree/master/doc/benchmark">Comparative Benchmarking</a></h2>
-<p>I consider in this benchmark the server [G-WAN 3.2.24 (64 bit)] (http://www.gwan.ch/) and [NGINX 1.1.13] (http://nginx.net/).</p>
+<p>I consider in this benchmark the server [G-WAN 3.2.24 (64 bit)] (http://www.gwan.ch/) and [NGINX 1.1.16] (http://nginx.net/).</p>
<h2>gwan run with the follow options:</h2>
@@ -112,14 +117,13 @@
<h2>nginx is configured in this way:</h2>
-<pre><code>nginx version: nginx/1.1.13
+<pre><code>nginx version: nginx/1.1.16
TLS SNI support enabled
-configure arguments: --prefix=/usr --sbin-path=/usr/sbin/nginx --conf-path=/etc/nginx/nginx.conf --error-log-path=/var/log/nginx/error_log
---pid-path=/var/run/nginx.pid --lock-path=/var/lock/nginx.lock --user=nginx --group=nginx --with-cc-opt=-I/usr/include --with-ld-opt=-L/usr/lib
---http-log-path=/var/log/nginx/access_log --http-client-body-temp-path=/var/tmp/nginx/client --http-proxy-temp-path=/var/tmp/nginx/proxy
---http-fastcgi-temp-path=/var/tmp/nginx/fastcgi --http-scgi-temp-path=/var/tmp/nginx/scgi --http-uwsgi-temp-path=/var/tmp/nginx/uwsgi
---with-ipv6 --with-pcre --with-http_realip_module --with-http_ssl_module --without-mail_imap_module --without-mail_pop3_module
---without-mail_smtp_module
+configure arguments: --prefix=/usr --sbin-path=/usr/sbin/nginx --conf-path=/etc/nginx/nginx.conf --error-log-path=/var/log/nginx/error_log --pid-path=/var/run/nginx.pid
+--lock-path=/var/lock/nginx.lock --user=nginx --group=nginx --with-cc-opt=-I/usr/include --with-ld-opt=-L/usr/lib --http-log-path=/var/log/nginx/access_log
+--http-client-body-temp-path=/var/tmp/nginx/client --http-proxy-temp-path=/var/tmp/nginx/proxy --http-fastcgi-temp-path=/var/tmp/nginx/fastcgi
+--http-scgi-temp-path=/var/tmp/nginx/scgi --http-uwsgi-temp-path=/var/tmp/nginx/uwsgi --with-ipv6 --with-pcre --with-http_realip_module --with-http_ssl_module
+--without-mail_imap_module --without-mail_pop3_module --without-mail_smtp_module
</code></pre>
<h2>nginx run with the follow configuration:</h2>
28 README.md
View
@@ -44,7 +44,7 @@ The current version offers the following features :
* Browser cache management (headers: If-Modified-Since/Last-modified).
* Chunk-encoding transfers support.
* HTTP multi-range request support.
- * Memory caching of document root for (small) static pages with smart deflate compression and CSS/JS reduction.
+ * Memory caching of document root for (small) static pages with smart gzip compression and CSS/JS reduction.
* Support for automatic update of caching document root with inotify (on Linux).
* Support for pipelining.
* Support for virtual hosts (also with SSL).
@@ -59,14 +59,12 @@ The current version offers the following features :
* Support for [JSONRequest](http://json.org/JSONRequest.html).
* Accept HTTP uploads up to 4 GB without increasing memory usage.
* Support for upload progress via USP (ULib Servlet Page).
- * General [CGI](http://it.wikipedia.org/wiki/Common_Gateway_Interface) support (run any CGI script) with automatic output compression (using deflate method).
+ * General [CGI](http://it.wikipedia.org/wiki/Common_Gateway_Interface) support (run any CGI script) with automatic output compression (using gzip method).
* CGI support for shell script processes (with automatic management of form and cookie).
* CGI support for the X-Sendfile feature and also supports X-Accel-Redirect headers transparently.
* Support for minify HTML CGI output with wrapping [google page speed SDK](http://code.google.com/speed/page-speed/download.html#pagespeed-sdk).
* Support for running JavaScript code with wrapping [google V8 JavaScript Engine](http://code.google.com/apis/v8/intro.html).
- * Support for [HTTP pseudo-streaming](http://www.phpmotionwiz.com/what-is-pseudo-streaming) for FLV video.
- * Support for [HTTP Strict Transport Security](https://developer.mozilla.org/en/Security/HTTP_Strict_Transport_Security).
- * Support for [HTTP Session Hijacking mitigation](http://cleverlogic.net/articles/kochure).
+ * [HTTP pseudo-streaming](http://www.phpmotionwiz.com/what-is-pseudo-streaming) for FLV video managed transparently.
* [C Servlet Support](http://bellard.org/tcc/) with libtcc (if available) as a backend for dynamic code generation (experimental).
* Support for Windows (without preforking), precompiled binaries are available [here](https://github.com/stefanocasazza/ULib/tree/master/win32).
* Requests cut in phases for modular architecture (apache-like).
@@ -86,6 +84,11 @@ The current version offers the following features :
* `mod_geoip` : [geolocation support](http://www.maxmind.com/geoip/api/c.shtml) (experimental).
* `mod_stream` : simple streaming support (experimental).
* `mod_socket` : [Web Socket](http://dev.w3.org/html5/websockets) application framework (experimental).
+ * Security protection :
+ * [HTTP Session Hijacking](http://cleverlogic.net/articles/kochure) mitigation.
+ * [Algorithmic Complexity Attacks](http://lwn.net/Articles/474365/) prevention by randomizing hash seed.
+ * [DNS rebinding](http://en.wikipedia.org/wiki/DNS_rebinding) prevention by RFC1918 filtering and Host header validation.
+ * support for [HTTP Strict Transport Security](https://developer.mozilla.org/en/Security/HTTP_Strict_Transport_Security).
Benchmarking
@@ -104,7 +107,7 @@ Use apachebench (ab)
[Comparative Benchmarking](https://github.com/stefanocasazza/ULib/tree/master/doc/benchmark)
--------------------------------------------------------------------------------------------
-I consider in this benchmark the server [G-WAN 3.2.24 (64 bit)] (http://www.gwan.ch/) and [NGINX 1.1.13] (http://nginx.net/).
+I consider in this benchmark the server [G-WAN 3.2.24 (64 bit)] (http://www.gwan.ch/) and [NGINX 1.1.16] (http://nginx.net/).
gwan run with the follow options:
---------------------------------
@@ -115,14 +118,13 @@ gwan run with the follow options:
nginx is configured in this way:
--------------------------------
- nginx version: nginx/1.1.13
+ nginx version: nginx/1.1.16
TLS SNI support enabled
- configure arguments: --prefix=/usr --sbin-path=/usr/sbin/nginx --conf-path=/etc/nginx/nginx.conf --error-log-path=/var/log/nginx/error_log
- --pid-path=/var/run/nginx.pid --lock-path=/var/lock/nginx.lock --user=nginx --group=nginx --with-cc-opt=-I/usr/include --with-ld-opt=-L/usr/lib
- --http-log-path=/var/log/nginx/access_log --http-client-body-temp-path=/var/tmp/nginx/client --http-proxy-temp-path=/var/tmp/nginx/proxy
- --http-fastcgi-temp-path=/var/tmp/nginx/fastcgi --http-scgi-temp-path=/var/tmp/nginx/scgi --http-uwsgi-temp-path=/var/tmp/nginx/uwsgi
- --with-ipv6 --with-pcre --with-http_realip_module --with-http_ssl_module --without-mail_imap_module --without-mail_pop3_module
- --without-mail_smtp_module
+ configure arguments: --prefix=/usr --sbin-path=/usr/sbin/nginx --conf-path=/etc/nginx/nginx.conf --error-log-path=/var/log/nginx/error_log --pid-path=/var/run/nginx.pid
+ --lock-path=/var/lock/nginx.lock --user=nginx --group=nginx --with-cc-opt=-I/usr/include --with-ld-opt=-L/usr/lib --http-log-path=/var/log/nginx/access_log
+ --http-client-body-temp-path=/var/tmp/nginx/client --http-proxy-temp-path=/var/tmp/nginx/proxy --http-fastcgi-temp-path=/var/tmp/nginx/fastcgi
+ --http-scgi-temp-path=/var/tmp/nginx/scgi --http-uwsgi-temp-path=/var/tmp/nginx/uwsgi --with-ipv6 --with-pcre --with-http_realip_module --with-http_ssl_module
+ --without-mail_imap_module --without-mail_pop3_module --without-mail_smtp_module
nginx run with the follow configuration:
----------------------------------------
495 configure
View
@@ -626,8 +626,6 @@ DOXY_TRUE
DOXYGEN
FINAL_FALSE
FINAL_TRUE
-ZIP_FALSE
-ZIP_TRUE
MEMORY_POOL_FALSE
MEMORY_POOL_TRUE
ULIB
@@ -711,6 +709,8 @@ SEMAPHORE_FALSE
SEMAPHORE_TRUE
PTHREAD_FALSE
PTHREAD_TRUE
+ZIP_FALSE
+ZIP_TRUE
V8_FALSE
V8_TRUE
PAGE_SPEED_FALSE
@@ -735,30 +735,30 @@ LDAP_FALSE
LDAP_TRUE
PCRE_FALSE
PCRE_TRUE
-SSL_TS_FALSE
-SSL_TS_TRUE
SSH_FALSE
SSH_TRUE
+SSL_TS_FALSE
+SSL_TS_TRUE
SSL_FALSE
SSL_TRUE
PRG_LDFLAGS
-HAVE_V8
-HAVE_PAGE_SPEED
+USE_LIBV8
+USE_PAGE_SPEED
PAGESPEED_ROOT_DIR
-HAVE_LIBXML2
-HAVE_LIBEVENT
-HAVE_DBI
-HAVE_MYSQL
-HAVE_LDAP
-HAVE_CURL
-HAVE_SSH
-HAVE_EXPAT
-HAVE_PCRE
+USE_LIBXML2
+USE_LIBEVENT
+USE_LIBDBI
+USE_LIBMYSQL
+USE_LIBLDAP
+USE_LIBCURL
+USE_LIBSSH
+USE_LIBEXPAT
+USE_LIBPCRE
HAVE_SSL_TS
-HAVE_SSL
-HAVE_MAGIC
-HAVE_LIBUUID
-HAVE_LIBZ
+USE_LIBSSL
+USE_LIBMAGIC
+USE_LIBUUID
+USE_LIBZ
USE_PARSER_FALSE
USE_PARSER_TRUE
XLEX
@@ -20744,30 +20744,30 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
#OST_SGI_STLPORT
#OST_CXX_NOEXCEPTIONS
- ulib_ssl_msg="no (--with-ssl)"
- ulib_ssh_msg="no (--with-ssh)"
- ulib_pcre_msg="no (--with-pcre)"
- ulib_ldap_msg="no (--with-ldap)"
- ulib_libz_msg="no (--with-libz)"
- ulib_curl_msg="no (--with-curl)"
- ulib_expat_msg="no (--with-expat)"
- ulib_magic_msg="no (--with-magic)"
- ulib_parser_msg="no (--with-parser)"
- ulib_mysql_msg="no (--with-mysql)"
- ulib_libuuid_msg="no (--with-libuuid)"
- ulib_libevent_msg="no (--with-libevent)"
- ulib_libxml2_msg="no (--with-libxml2)"
- ulib_dbi_msg="no (--with-libdbi)"
-ulib_pagespeed_msg="no (--with-page-speed)"
- ulib_v8_msg="no (--with-v8-javascript)"
- ulib_ipv6_msg="no (--with-ipv6)"
- ulib_pch_msg="no (--enable-pch)"
- ulib_LFS_msg="no (--enable-LFS)"
- ulib_dbg_msg="no (--enable-debug)"
- ulib_final_msg="no (--enable-final)"
- ulib_zip_msg="no (--enable-zip)"
- ulib_memp_msg="no (--enable-memory-pool)"
-# ulib_manual_msg="no (--enable-manual)"
+ ulib_ssl_msg="no (--with-ssl)"
+ ulib_ssh_msg="no (--with-ssh)"
+ ulib_pcre_msg="no (--with-pcre)"
+ ulib_ldap_msg="no (--with-ldap)"
+ ulib_libz_msg="no (--with-libz)"
+ ulib_curl_msg="no (--with-curl)"
+ ulib_expat_msg="no (--with-expat)"
+ ulib_magic_msg="no (--with-magic)"
+ ulib_parser_msg="no (--with-parser)"
+ ulib_mysql_msg="no (--with-mysql)"
+ ulib_libuuid_msg="no (--with-libuuid)"
+ ulib_libevent_msg="no (--with-libevent)"
+ ulib_libxml2_msg="no (--with-libxml2)"
+ ulib_dbi_msg="no (--with-libdbi)"
+ulib_pagespeed_msg="no (--with-page-speed)"
+ ulib_v8_msg="no (--with-v8-javascript)"
+ ulib_ipv6_msg="no (--with-ipv6)"
+ ulib_pch_msg="no (--enable-pch)"
+ ulib_LFS_msg="no (--enable-LFS)"
+ ulib_dbg_msg="no (--enable-debug)"
+ ulib_final_msg="no (--enable-final)"
+ ulib_zip_msg="no (--enable-zip)"
+ ulib_memp_msg="no (--enable-memory-pool)"
+# ulib_manual_msg="no (--enable-manual)"
# Add --{enable,disable,with,without}-feature options.
@@ -20781,7 +20781,11 @@ fi
if test -z "$enable_memory_pool" ; then
enable_memory_pool="yes"
-$as_echo "#define U_MEMORY_POOL 1" >>confdefs.h
+$as_echo "#define ENABLE_MEMPOOL 1" >>confdefs.h
+
+ else
+
+$as_echo "#define DISABLE_MEMPOOL 1" >>confdefs.h
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_memory_pool}" >&5
@@ -20797,7 +20801,11 @@ fi
if test -z "$enable_LFS" ; then
enable_LFS="yes"
-$as_echo "#define HAVE_LFS 1" >>confdefs.h
+$as_echo "#define ENABLE_LFS 1" >>confdefs.h
+
+ else
+
+$as_echo "#define DISABLE_LFS 1" >>confdefs.h
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_LFS" >&5
@@ -21548,21 +21556,21 @@ fi
LIBS=${LIBS_SAVE}
-libz_version="None"
-pcre_version="None"
-ldap_version="None"
-expat_version="None"
-libssh_version="None"
-libcurl_version="None"
-ssl_version="None"
-libmagic_version="None"
-libmysql_version="None"
-libuuid_version="None"
-libevent_version="None"
-libxml2_version="None"
-libdbi_version="None"
-page_speed_version="None"
-v8_version="None"
+libz_version="no"
+pcre_version="no"
+ldap_version="no"
+expat_version="no"
+libssh_version="no"
+libcurl_version="no"
+ssl_version="no"
+libmagic_version="no"
+libmysql_version="no"
+libuuid_version="no"
+libevent_version="no"
+libxml2_version="no"
+libdbi_version="no"
+page_speed_version="no"
+v8_version="no"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if LIBZ library is wanted" >&5
@@ -21599,11 +21607,13 @@ $as_echo "$msg" >&6; }
fi
else
echo "${T_MD}LIBZ found in $libzdir${T_ME}"
- HAVE_LIBZ=yes
- CPPFLAGS="$CPPFLAGS -DHAVE_LIBZ"
+ USE_LIBZ=yes
+
+$as_echo "#define USE_LIBZ 1" >>confdefs.h
+
libz_version=$(grep ZLIB_VERSION $libzdir/include/zlib.h | head -n1 | cut -d'"' -f2)
if test -z "${libz_version}"; then
- libz_version="Unknown"
+ libz_version="unknown"
fi
LIBS="-lz $LIBS";
if test $libzdir != "${CROSS_ENVIRONMENT}/usr"; then
@@ -21668,11 +21678,13 @@ $as_echo "$msg" >&6; }
fi
else
echo "${T_MD}libuuid found in $libuuiddir${T_ME}"
- HAVE_LIBUUID=yes
- CPPFLAGS="$CPPFLAGS -DHAVE_LIBUUID";
+ USE_LIBUUID=yes
+
+$as_echo "#define USE_LIBUUID 1" >>confdefs.h
+
libuuid_version=$(pkg-config --modversion ext2fs)
if test -z "${libuuid_version}"; then
- libuuid_version="Unknown"
+ libuuid_version="unknown"
fi
LIBS="-luuid $LIBS";
if test $libuuiddir != "${CROSS_ENVIRONMENT}/usr"; then
@@ -21722,11 +21734,13 @@ $as_echo "$msg" >&6; }
fi
else
echo "${T_MD}libmagic found in $magicdir${T_ME}"
- HAVE_MAGIC=yes
- CPPFLAGS="$CPPFLAGS -DHAVE_MAGIC";
+ USE_LIBMAGIC=yes
+
+$as_echo "#define USE_LIBMAGIC 1" >>confdefs.h
+
libmagic_version=$($magicdir/bin/file --version 2>&1 | head -n 1 | cut -d'-' -f2)
if test -z "${libmagic_version}"; then
- libmagic_version="Unknown"
+ libmagic_version="unknown"
fi
LIBS="-lmagic $LIBS";
if test $magicdir != "${CROSS_ENVIRONMENT}/usr"; then
@@ -21780,8 +21794,10 @@ $as_echo "yes" >&6; }
$as_echo "$msg" >&6; }
fi
else
- HAVE_SSL=yes
- CPPFLAGS="$CPPFLAGS -DHAVE_SSL";
+ USE_LIBSSL=yes
+
+$as_echo "#define USE_LIBSSL 1" >>confdefs.h
+
if test "$found_cyassl" = "yes"; then
echo "${T_MD}CYASSL found in $ssldir${T_ME}";
ssl_version=$(grep VERSION $ssldir/include/cyassl/openssl/opensslv.h | cut -d' ' -f3 | tr -d '\r\n');
@@ -21790,13 +21806,15 @@ $as_echo "$msg" >&6; }
echo "${T_MD}OPENSSL found in $ssldir${T_ME}";
if test -f "$ssldir/include/openssl/ts.h"; then
HAVE_SSL_TS="yes";
- CPPFLAGS="$CPPFLAGS -DHAVE_SSL_TS";
+
+$as_echo "#define HAVE_SSL_TS 1" >>confdefs.h
+
fi
ssl_version=$(pkg-config --modversion openssl);
LIBS="-lssl -lcrypto $LIBS";
fi
if test -z "${ssl_version}"; then
- ssl_version="Unknown";
+ ssl_version="unknown";
fi
if test $ssldir != "${CROSS_ENVIRONMENT}/usr"; then
CPPFLAGS="$CPPFLAGS -I$ssldir/include";
@@ -21846,11 +21864,13 @@ $as_echo "$msg" >&6; }
fi
else
echo "${T_MD}PCRE found in $pcredir${T_ME}"
- HAVE_PCRE=yes
- CPPFLAGS="$CPPFLAGS -DHAVE_PCRE"
+ USE_LIBPCRE=yes
+
+$as_echo "#define USE_LIBPCRE 1" >>confdefs.h
+
pcre_version=$($pcredir/bin/pcre-config --version)
if test -z "${pcre_version}"; then
- pcre_version="Unknown"
+ pcre_version="unknown"
fi
LIBS="-lpcre $LIBS";
if test $pcredir != "${CROSS_ENVIRONMENT}/usr"; then
@@ -21900,11 +21920,13 @@ $as_echo "$msg" >&6; }
fi
else
echo "${T_MD}EXPAT found in $expatdir${T_ME}"
- HAVE_EXPAT=yes
- CPPFLAGS="$CPPFLAGS -DHAVE_EXPAT"
+ USE_LIBEXPAT=yes
+
+$as_echo "#define USE_LIBEXPAT 1" >>confdefs.h
+
expat_version=$(strings $expatdir/lib*/libexpat.* | grep "^expat_[0-9]" | head -n1 | cut -d'_' -f2)
if test -z "${expat_version}"; then
- expat_version="Unknown"
+ expat_version="unknown"
fi
LIBS="-lexpat $LIBS";
if test $expatdir != "${CROSS_ENVIRONMENT}/usr"; then
@@ -21943,11 +21965,13 @@ $as_echo "yes" >&6; }
as_fn_error $? "Cannot find SSH library" "$LINENO" 5
else
echo "${T_MD}libssh found in $sshdir${T_ME}"
- HAVE_SSH=yes
- CPPFLAGS="$CPPFLAGS -DHAVE_SSH";
+ USE_LIBSSH=yes
+
+$as_echo "#define USE_LIBSSH 1" >>confdefs.h
+
libssh_version=$(strings $sshdir/lib*/libssh.so | grep 'libssh-[0-9]' | head -n1 | cut -d'-' -f4)
if test -z "${libssh_version}"; then
- libssh_version="Unknown"
+ libssh_version="unknown"
fi
LIBS="-lssh $LIBS";
if test $sshdir != "${CROSS_ENVIRONMENT}/usr"; then
@@ -21986,11 +22010,13 @@ $as_echo "yes" >&6; }
as_fn_error $? "Cannot find cURL library" "$LINENO" 5
else
echo "${T_MD}libcurl found in $curldir${T_ME}"
- HAVE_CURL=yes
- CPPFLAGS="$CPPFLAGS -DHAVE_CURL";
+ USE_LIBCURL=yes
+
+$as_echo "#define USE_LIBCURL 1" >>confdefs.h
+
libcurl_version=$($curldir/bin/curl-config --version | sed -e "s/libcurl //g")
if test -z "${libcurl_version}"; then
- libcurl_version="Unknown"
+ libcurl_version="unknown"
fi
LIBS="-lcurl $LIBS";
if test $curldir != "${CROSS_ENVIRONMENT}/usr"; then
@@ -22047,14 +22073,16 @@ $as_echo "yes" >&6; }
as_fn_error $? "Cannot find LDAP include" "$LINENO" 5
else
echo "${T_MD}LDAP found in $ldapdir${T_ME}"
- HAVE_LDAP=yes
- CPPFLAGS="$CPPFLAGS -DHAVE_LDAP"
+ USE_LIBLDAP=yes
+
+$as_echo "#define USE_LIBLDAP 1" >>confdefs.h
+
if test -f "$LDAP_INCS/ldap_ssl.h"; then
CPPFLAGS="$CPPFLAGS -DHAVE_LDAP_SSL_H"
fi
ldap_version=$(grep LDAP_API_VERSION ${LDAP_INCS}/*ldap*.h | awk '{print $NF}')
if test -z "${ldap_version}"; then
- ldap_version="Unknown"
+ ldap_version="unknown"
fi
LIBS="$LDAP_LIBS $LIBS"
if test $ldapdir != "${CROSS_ENVIRONMENT}/usr"; then
@@ -22093,11 +22121,13 @@ $as_echo "yes" >&6; }
as_fn_error $? "Cannot find MYSQL library" "$LINENO" 5
else
echo "${T_MD}MySQL found in $mysqldir${T_ME}"
- HAVE_MYSQL=yes
- CPPFLAGS="$CPPFLAGS -DHAVE_MYSQL";
+ USE_LIBMYSQL=yes
+
+$as_echo "#define USE_LIBMYSQL 1" >>confdefs.h
+
libmysql_version=$(grep MYSQL_VERSION_ID $mysqldir/include/mysql/mysql_version.h | cut -f3)
if test -z "${libmysql_version}"; then
- libmysql_version="Unknown"
+ libmysql_version="unknown"
fi
LIBS="-lmysqlclient $LIBS";
if test $mysqldir != "${CROSS_ENVIRONMENT}/usr"; then
@@ -22141,11 +22171,13 @@ $as_echo "yes" >&6; }
as_fn_error $? "Cannot find DBI library" "$LINENO" 5
else
echo "${T_MD}DBI found in $dbidir${T_ME}"
- HAVE_DBI=yes
- CPPFLAGS="$CPPFLAGS -DHAVE_DBI";
+ USE_LIBDBI=yes
+
+$as_echo "#define USE_LIBDBI 1" >>confdefs.h
+
libdbi_version=$(strings $dbidir/lib*/libdbi.* | grep "^libdbi v[0-9]" | cut -d'v' -f2 | head -n1)
if test -z "${libdbi_version}"; then
- libdbi_version="Unknown"
+ libdbi_version="unknown"
fi
LIBS="-ldbi $LIBS";
if test $dbidir != "${CROSS_ENVIRONMENT}/usr"; then
@@ -22189,11 +22221,13 @@ $as_echo "yes" >&6; }
as_fn_error $? "Cannot find LIBEVENT library" "$LINENO" 5
else
echo "${T_MD}libevent found in $libeventdir${T_ME}"
- HAVE_LIBEVENT=yes
- CPPFLAGS="$CPPFLAGS -DHAVE_LIBEVENT";
+ USE_LIBEVENT=yes
+
+$as_echo "#define USE_LIBEVENT 1" >>confdefs.h
+
libevent_version=$(strings $libeventdir/lib*/libevent* | grep "^libevent-[0-9]" | head -n1 | cut -d'-' -f2 | awk -F'.so' '{n=1; print $n}')
if test -z "${libevent_version}"; then
- libevent_version="Unknown"
+ libevent_version="unknown"
fi
LIBS="-levent $LIBS";
if test $libeventdir != "${CROSS_ENVIRONMENT}/usr"; then
@@ -22232,11 +22266,13 @@ $as_echo "yes" >&6; }
as_fn_error $? "Cannot find LIBXML2 library" "$LINENO" 5
else
echo "${T_MD}libxml2 found in $libxml2dir${T_ME}"
- HAVE_LIBXML2=yes
- CPPFLAGS="$CPPFLAGS -DHAVE_LIBXML2";
+ USE_LIBXML2=yes
+
+$as_echo "#define USE_LIBXML2 1" >>confdefs.h
+
libxml2_version=$(pkg-config --modversion libxml-2.0)
if test -z "${libxml2_version}"; then
- libxml2_version="Unknown"
+ libxml2_version="unknown"
fi
LIBS="-lxml2 $LIBS";
CPPFLAGS="$CPPFLAGS -I$libxml2dir/include/libxml2";
@@ -22275,8 +22311,10 @@ $as_echo "yes" >&6; }
as_fn_error $? "\"Cannot find page-speed SDK\"" "$LINENO" 5;
else
echo "${T_MD}page-speed SDK found in $page_speeddir${T_ME}"
- HAVE_PAGE_SPEED=yes
- CPPFLAGS="$CPPFLAGS -DHAVE_PAGE_SPEED";
+ USE_PAGE_SPEED=yes
+
+$as_echo "#define USE_PAGE_SPEED 1" >>confdefs.h
+
page_speed_version=$(ls -1 $page_speeddir | grep page-speed | cut -d'-' -f3)
PAGESPEED_ROOT_DIR=$page_speeddir/page-speed-$page_speed_version
@@ -22311,8 +22349,10 @@ $as_echo "yes" >&6; }
as_fn_error $? "\"Cannot find V8 JavaScript Engine\"" "$LINENO" 5;
else
echo "${T_MD}V8 JavaScript Engine found in $v8dir${T_ME}"
- HAVE_V8=yes
- CPPFLAGS="$CPPFLAGS -DHAVE_V8";
+ USE_LIBV8=yes
+
+$as_echo "#define USE_LIBV8 1" >>confdefs.h
+
v8_version=$(strings $v8dir/lib*/libv8.so | grep -i 'libv8' | head -n1 | cut -b10-)
fi
fi
@@ -22325,7 +22365,7 @@ fi
- if test "$HAVE_SSL" = "yes"; then
+ if test "$USE_LIBSSL" = "yes"; then
SSL_TRUE=
SSL_FALSE='#'
else
@@ -22333,14 +22373,6 @@ else
SSL_FALSE=
fi
- if test "$HAVE_SSH" = "yes"; then
- SSH_TRUE=
- SSH_FALSE='#'
-else
- SSH_TRUE='#'
- SSH_FALSE=
-fi
-
if test "$HAVE_SSL_TS" = "yes"; then
SSL_TS_TRUE=
SSL_TS_FALSE='#'
@@ -22349,7 +22381,15 @@ else
SSL_TS_FALSE=
fi
- if test "$HAVE_PCRE" = "yes"; then
+ if test "$USE_LIBSSH" = "yes"; then
+ SSH_TRUE=
+ SSH_FALSE='#'
+else
+ SSH_TRUE='#'
+ SSH_FALSE=
+fi
+
+ if test "$USE_LIBPCRE" = "yes"; then
PCRE_TRUE=
PCRE_FALSE='#'
else
@@ -22357,7 +22397,7 @@ else
PCRE_FALSE=
fi
- if test "$HAVE_LDAP" = "yes"; then
+ if test "$USE_LIBLDAP" = "yes"; then
LDAP_TRUE=
LDAP_FALSE='#'
else
@@ -22365,7 +22405,7 @@ else
LDAP_FALSE=
fi
- if test "$HAVE_CURL" = "yes"; then
+ if test "$USE_LIBCURL" = "yes"; then
CURL_TRUE=
CURL_FALSE='#'
else
@@ -22373,7 +22413,7 @@ else
CURL_FALSE=
fi
- if test "$HAVE_LIBZ" = "yes"; then
+ if test "$USE_LIBZ" = "yes"; then
LIBZ_TRUE=
LIBZ_FALSE='#'
else
@@ -22381,7 +22421,7 @@ else
LIBZ_FALSE=
fi
- if test "$HAVE_EXPAT" = "yes"; then
+ if test "$USE_LIBEXPAT" = "yes"; then
EXPAT_TRUE=
EXPAT_FALSE='#'
else
@@ -22389,7 +22429,7 @@ else
EXPAT_FALSE=
fi
- if test "$HAVE_MAGIC" = "yes"; then
+ if test "$USE_LIBMAGIC" = "yes"; then
MAGIC_TRUE=
MAGIC_FALSE='#'
else
@@ -22397,7 +22437,7 @@ else
MAGIC_FALSE=
fi
- if test "$HAVE_MYSQL" = "yes"; then
+ if test "$USE_LIBMYSQL" = "yes"; then
MYSQL_TRUE=
MYSQL_FALSE='#'
else
@@ -22405,7 +22445,7 @@ else
MYSQL_FALSE=
fi
- if test "$HAVE_DBI" = "yes"; then
+ if test "$USE_LIBDBI" = "yes"; then
DBI_TRUE=
DBI_FALSE='#'
else
@@ -22413,7 +22453,7 @@ else
DBI_FALSE=
fi
- if test "$HAVE_LIBEVENT" = "yes"; then
+ if test "$USE_LIBEVENT" = "yes"; then
LIBEVENT_TRUE=
LIBEVENT_FALSE='#'
else
@@ -22421,7 +22461,7 @@ else
LIBEVENT_FALSE=
fi
- if test "$HAVE_LIBXML2" = "yes"; then
+ if test "$USE_LIBXML2" = "yes"; then
LIBXML2_TRUE=
LIBXML2_FALSE='#'
else
@@ -22429,7 +22469,7 @@ else
LIBXML2_FALSE=
fi
- if test "$HAVE_PAGE_SPEED" = "yes"; then
+ if test "$USE_PAGE_SPEED" = "yes"; then
PAGE_SPEED_TRUE=
PAGE_SPEED_FALSE='#'
else
@@ -22437,7 +22477,7 @@ else
PAGE_SPEED_FALSE=
fi
- if test "$HAVE_V8" = "yes"; then
+ if test "$USE_LIBV8" = "yes"; then
V8_TRUE=
V8_FALSE='#'
else
@@ -22534,8 +22574,8 @@ _ACEOF
LIBS_SAVE=${LIBS}
-if test "$HAVE_LIBZ" = "yes"; then
- ulib_libz_msg="enabled"
+if test "$USE_LIBZ" = "yes"; then
+ ulib_libz_msg="yes ( ${libz_version} )"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for zlib_deflate_workspacesize in -lz" >&5
$as_echo_n "checking for zlib_deflate_workspacesize in -lz... " >&6; }
if ${ac_cv_lib_z_zlib_deflate_workspacesize+:} false; then :
@@ -22586,62 +22626,88 @@ fi
$as_echo "#define U_ZLIB_DEFLATE_WORKSPACESIZE 1" >>confdefs.h
fi
+ if test "$enable_zip" = "yes"; then
+ ulib_zip_msg="enabled"
+
+$as_echo "#define ENABLE_ZIP 1" >>confdefs.h
+
+ if true; then
+ ZIP_TRUE=
+ ZIP_FALSE='#'
+else
+ ZIP_TRUE='#'
+ ZIP_FALSE=
+fi
+
+ else
+
+$as_echo "#define DISABLE_ZIP 1" >>confdefs.h
+
+ if false; then
+ ZIP_TRUE=
+ ZIP_FALSE='#'
+else
+ ZIP_TRUE='#'
+ ZIP_FALSE=
+fi
+
+ fi
fi
-if test "$HAVE_PCRE" = "yes"; then
- ulib_pcre_msg="enabled"
+if test "$USE_LIBPCRE" = "yes"; then
+ ulib_pcre_msg="yes ( ${pcre_version} )"
fi
-if test "$HAVE_CURL" = "yes"; then
- ulib_curl_msg="enabled"
+if test "$USE_LIBCURL" = "yes"; then
+ ulib_curl_msg="yes ( ${libcurl_version} )"
fi
-if test "$HAVE_LDAP" = "yes"; then
- ulib_ldap_msg="enabled"
+if test "$USE_LIBLDAP" = "yes"; then
+ ulib_ldap_msg="yes ( ${ldap_version} )"
fi
-if test "$HAVE_EXPAT" = "yes"; then
- ulib_expat_msg="enabled"
+if test "$USE_LIBEXPAT" = "yes"; then
+ ulib_expat_msg="yes ( ${expat_version} )"
fi
-if test "$HAVE_MAGIC" = "yes"; then
- ulib_magic_msg="enabled"
+if test "$USE_LIBMAGIC" = "yes"; then
+ ulib_magic_msg="yes ( ${libmagic_version} )"
fi
-if test "$HAVE_SSL" = "yes"; then
- ulib_ssl_msg="enabled"
+if test "$USE_LIBSSL" = "yes"; then
+ ulib_ssl_msg="yes ( ${ssl_version} )"
fi
-if test "$HAVE_SSH" = "yes"; then
- ulib_ssh_msg="enabled"
+if test "$USE_LIBSSH" = "yes"; then
+ ulib_ssh_msg="yes ( ${libssh_version} )"
fi
-if test "$HAVE_MYSQL" = "yes"; then
- ulib_mysql_msg="enabled"
+if test "$USE_LIBMYSQL" = "yes"; then
+ ulib_mysql_msg="yes ( ${libmysql_version} )"
fi
-if test "$HAVE_DBI" = "yes"; then
- ulib_dbi_msg="enabled"
+if test "$USE_LIBDBI" = "yes"; then
+ ulib_dbi_msg="yes ( ${libdbi_version} )"
fi
-if test "$HAVE_LIBUUID" = "yes"; then
- ulib_libuuid_msg="enabled"
+if test "$USE_LIBUUID" = "yes"; then
+ ulib_libuuid_msg="yes ( ${libuuid_version} )"
fi
-if test "$HAVE_LIBEVENT" = "yes"; then
- ulib_libevent_msg="enabled"
+if test "$USE_LIBEVENT" = "yes"; then
+ ulib_libevent_msg="yes ( ${libevent_version} )"
fi
-if test "$HAVE_LIBXML2" = "yes"; then
- ulib_libxml2_msg="enabled"
+if test "$USE_LIBXML2" = "yes"; then
+ ulib_libxml2_msg="yes ( ${libxml2_version} )"
fi
-if test "$HAVE_PAGE_SPEED" = "yes"; then
- ulib_pagespeed_msg="enabled"
+if test "$USE_PAGE_SPEED" = "yes"; then
+ ulib_pagespeed_msg="yes ( ${page_speed_version} )"
fi
-if test "$HAVE_V8" = "yes"; then
- ulib_v8_msg="enabled"
+if test "$USE_LIBV8" = "yes"; then
+ ulib_v8_msg="yes ( ${v8_version} )"
fi
case "$target_os" in
@@ -22650,7 +22716,7 @@ case "$target_os" in
LDFLAGS="${LDFLAGS} -Wl,--enable-auto-import"
fi
LIBS_SAVE="${LIBS_SAVE} -lwinmm -lws2_32"
- if test "$HAVE_SSL" = "yes"; then
+ if test "$USE_LIBSSL" = "yes"; then
LIBS_SAVE="${LIBS_SAVE} -lwsock32 -lgdi32 -lz";
fi
if false; then
@@ -26514,7 +26580,11 @@ fi
if test "$ost_cv_ipv6" = "yes"; then
ulib_ipv6_msg="enabled"
-$as_echo "#define HAVE_IPV6 1" >>confdefs.h
+$as_echo "#define ENABLE_IPV6 1" >>confdefs.h
+
+else
+
+$as_echo "#define DISABLE_IPV6 1" >>confdefs.h
fi
@@ -26681,10 +26751,10 @@ modules="mod_rpc mod_shib mod_stream mod_nocat mod_socket mod_scgi mod_fcgi mod_
# Remove modules that will not be compiles
-if test "$HAVE_EXPAT" != "yes"; then
+if test "$USE_EXPAT" != "yes"; then
modules=`echo $modules | sed s/mod_soap//`
fi
-if test "$HAVE_PCRE" != "yes"; then
+if test "$USE_PCRE" != "yes"; then
modules=`echo $modules | sed s/mod_proxy//`
fi
if test "x$ac_cv_lib_GeoIP_GeoIP_id_by_ipnum" != "xyes"; then
@@ -26990,30 +27060,6 @@ fi
fi
-if test "$enable_zip" = "yes"; then
- ulib_zip_msg="enabled"
-
-$as_echo "#define HAVE_ZIP 1" >>confdefs.h
-
- if true; then
- ZIP_TRUE=
- ZIP_FALSE='#'
-else
- ZIP_TRUE='#'
- ZIP_FALSE=
-fi
-
-else
- if false; then
- ZIP_TRUE=
- ZIP_FALSE='#'
-else
- ZIP_TRUE='#'
- ZIP_FALSE=
-fi
-
-fi
-
if test "$enable_LFS" = "yes"; then
ulib_LFS_msg="enabled"
CPPFLAGS="${CPPFLAGS} -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
@@ -27170,7 +27216,7 @@ $as_echo "$ulib_cc_flag" >&6; }
if test "$enable_debug" = "yes"; then
MAYBE_FLAGS="$MAYBE_FLAGS -Wp,-D_FORTIFY_SOURCE=2 -Wunsafe-loop-optimizations"
- if test "$HAVE_SSL" = "yes"; then
+ if test "$USE_LIBSSL" = "yes"; then
MAYBE_FLAGS="$MAYBE_FLAGS -Wno-unused-parameter"
fi
else
@@ -27438,6 +27484,16 @@ ULIB_CPPFLAGS="${CPPFLAGS}"
cat >>confdefs.h <<_ACEOF
+#define CXX_VAR "${CXX}"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define LD_VAR "${LD}"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
#define LIBS_VAR "${LIBS}"
_ACEOF
@@ -27583,62 +27639,52 @@ echo \
configure: Configured to build src/ulib/libulib:
ULib version: ${VERSION}
+ Build ULib: Shared=${enable_shared}, Static=${enable_static}
+
Host setup: ${host}
Install prefix: ${prefix}
Install plugin: ${pkglibexecdir}
Configuration data: ${sysconfdir}
+
Operating System: $os_version
C++ Compiler: ${CXX} ( $gcc_version )
- C Flags: ${CFLAGS}
- C++ Flags: ${CXXFLAGS}
- Preprocessor Flags: ${CPPFLAGS}
- Linker Flags: ${LDFLAGS}
Linker: ${LD} ( $ld_version )
- Libraries: ${LIBS}
Standard C library: ${libc_version}
Standard C++ library: ${stdgpp_version}
+ Libraries: ${LIBS}
+
+ C Flags: ${CFLAGS}
+ C++ Flags: ${CXXFLAGS}
+ Linker Flags: ${LDFLAGS}
+ Preprocessor Flags: ${CPPFLAGS}
- LFS support: ${ulib_LFS_msg}
debug support: ${ulib_dbg_msg}
- zip support: ${ulib_zip_msg}
final build mode: ${ulib_final_msg}
precompiled header: ${ulib_pch_msg}
memory pool support: ${ulib_memp_msg}
+ LFS support: ${ulib_LFS_msg}
ipv6 support: ${ulib_ipv6_msg}
+ zip support: ${ulib_zip_msg}
+
LIBZ support: ${ulib_libz_msg}
- LIBZ library: ${libz_version}
PCRE support: ${ulib_pcre_msg}
- PCRE library: ${pcre_version}
SSL support: ${ulib_ssl_msg}
- SSL library: ${ssl_version}
SSH support: ${ulib_ssh_msg}
- SSH library: ${libssh_version}
LDAP support: ${ulib_ldap_msg}
- LDAP library: ${ldap_version}
cURL support: ${ulib_curl_msg}
- cURL library: ${libcurl_version}
XML support: ${ulib_expat_msg}
- Expat library: ${expat_version}
MAGIC support: ${ulib_magic_msg}
- MAGIC library: ${libmagic_version}
MySQL support: ${ulib_mysql_msg}
- MySQL library: ${libmysql_version}
DBI support: ${ulib_dbi_msg}
- DBI library: ${libdbi_version}
libuuid support: ${ulib_libuuid_msg}
- libuuid library: ${libuuid_version}
libevent support: ${ulib_libevent_msg}
- libevent library: ${libevent_version}
libxml2 support: ${ulib_libxml2_msg}
- libxml2 library: ${libxml2_version}
Page-Speed support: ${ulib_pagespeed_msg}
- Page-Speed SDK: ${page_speed_version}
V8 JavaScript support: ${ulib_v8_msg}
- V8 JavaScript: ${v8_version}
+
LEX/YACC support: ${ulib_parser_msg}
Lexical analyzer: ${LEX} ( ${flex_version} )
Parser generator: ${YACC} ( ${bison_version} )
- Build ULib: Shared=${enable_shared}, Static=${enable_static}
See include/ulib/internal/config.h for further configuration information.
------------------------------------------------------------------------"
@@ -27954,14 +28000,14 @@ if test -z "${SSL_TRUE}" && test -z "${SSL_FALSE}"; then
as_fn_error $? "conditional \"SSL\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-if test -z "${SSH_TRUE}" && test -z "${SSH_FALSE}"; then
- as_fn_error $? "conditional \"SSH\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${SSL_TS_TRUE}" && test -z "${SSL_TS_FALSE}"; then
as_fn_error $? "conditional \"SSL_TS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${SSH_TRUE}" && test -z "${SSH_FALSE}"; then
+ as_fn_error $? "conditional \"SSH\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
if test -z "${PCRE_TRUE}" && test -z "${PCRE_FALSE}"; then
as_fn_error $? "conditional \"PCRE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -28010,6 +28056,14 @@ if test -z "${V8_TRUE}" && test -z "${V8_FALSE}"; then
as_fn_error $? "conditional \"V8\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${ZIP_TRUE}" && test -z "${ZIP_FALSE}"; then
+ as_fn_error $? "conditional \"ZIP\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${ZIP_TRUE}" && test -z "${ZIP_FALSE}"; then
+ as_fn_error $? "conditional \"ZIP\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
if test -z "${PTHREAD_TRUE}" && test -z "${PTHREAD_FALSE}"; then
as_fn_error $? "conditional \"PTHREAD\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -28194,14 +28248,6 @@ if test -z "${MEMORY_POOL_TRUE}" && test -z "${MEMORY_POOL_FALSE}"; then
as_fn_error $? "conditional \"MEMORY_POOL\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-if test -z "${ZIP_TRUE}" && test -z "${ZIP_FALSE}"; then
- as_fn_error $? "conditional \"ZIP\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${ZIP_TRUE}" && test -z "${ZIP_FALSE}"; then
- as_fn_error $? "conditional \"ZIP\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${FINAL_TRUE}" && test -z "${FINAL_FALSE}"; then
as_fn_error $? "conditional \"FINAL\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -30840,11 +30886,12 @@ fi
# src/ulib/base/Makefile src/ulib/debug/Makefile \
# ulib-config ,[chmod a+x ulib-config] )
-# Common C++
+awk -f configure_log.awk config.log > include/ulib/internal/config1.h
+awk -f configure_h.awk include/ulib/internal/config.h > include/ulib/internal/config2.h
cd include/ulib/internal
-mv config.h config.tmp
-sed -e s!"@thrprefix@/thread.h"!"thread.h"! < config.tmp > config.h
-rm -f config.tmp
+sed -e s!"@thrprefix@/thread.h"!"thread.h"! < config.h > config3.h # Common C++
+cat config3.h config2.h config1.h > config.h
+rm -f config3.h config2.h config1.h
cd ../../..
echo
@@ -30855,7 +30902,7 @@ CPPFLAGS="-DHAVE_CONFIG_H -I${srcdir}/include ${CPPFLAGS}"
if test "$enable_pch" = "yes" ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build precompiled headers for ${srcdir}/include/ulib/all.h" >&5
$as_echo_n "checking build precompiled headers for ${srcdir}/include/ulib/all.h... " >&6; }
- echo "rm -f ${srcdir}/include/ulib/all.h.gch" > ${srcdir}/PCH.cmd
+ echo "rm -f ${srcdir}/include/ulib/all.h.gch" > ${srcdir}/PCH.cmd
echo "${CXX} ${CPPFLAGS} ${CXXFLAGS} -c ${srcdir}/include/ulib/all.h -o ${srcdir}/include/ulib/all.h.gch" >> ${srcdir}/PCH.cmd
rm -f ${srcdir}/include/ulib/all.h.gch
${CXX} ${CPPFLAGS} ${CXXFLAGS} -c ${srcdir}/include/ulib/all.h -o ${srcdir}/include/ulib/all.h.gch
243 configure.in
View
@@ -330,30 +330,30 @@ OST_CXX_NEW_INIT
#OST_CXX_NOEXCEPTIONS
dnl initialize all the info variables to 'no'
- ulib_ssl_msg="no (--with-ssl)"
- ulib_ssh_msg="no (--with-ssh)"
- ulib_pcre_msg="no (--with-pcre)"
- ulib_ldap_msg="no (--with-ldap)"
- ulib_libz_msg="no (--with-libz)"
- ulib_curl_msg="no (--with-curl)"
- ulib_expat_msg="no (--with-expat)"
- ulib_magic_msg="no (--with-magic)"
- ulib_parser_msg="no (--with-parser)"
- ulib_mysql_msg="no (--with-mysql)"
- ulib_libuuid_msg="no (--with-libuuid)"
- ulib_libevent_msg="no (--with-libevent)"
- ulib_libxml2_msg="no (--with-libxml2)"
- ulib_dbi_msg="no (--with-libdbi)"
-ulib_pagespeed_msg="no (--with-page-speed)"
- ulib_v8_msg="no (--with-v8-javascript)"
- ulib_ipv6_msg="no (--with-ipv6)"
- ulib_pch_msg="no (--enable-pch)"
- ulib_LFS_msg="no (--enable-LFS)"
- ulib_dbg_msg="no (--enable-debug)"
- ulib_final_msg="no (--enable-final)"
- ulib_zip_msg="no (--enable-zip)"
- ulib_memp_msg="no (--enable-memory-pool)"
-# ulib_manual_msg="no (--enable-manual)"
+ ulib_ssl_msg="no (--with-ssl)"
+ ulib_ssh_msg="no (--with-ssh)"
+ ulib_pcre_msg="no (--with-pcre)"
+ ulib_ldap_msg="no (--with-ldap)"
+ ulib_libz_msg="no (--with-libz)"
+ ulib_curl_msg="no (--with-curl)"
+ ulib_expat_msg="no (--with-expat)"
+ ulib_magic_msg="no (--with-magic)"
+ ulib_parser_msg="no (--with-parser)"
+ ulib_mysql_msg="no (--with-mysql)"
+ ulib_libuuid_msg="no (--with-libuuid)"
+ ulib_libevent_msg="no (--with-libevent)"
+ ulib_libxml2_msg="no (--with-libxml2)"
+ ulib_dbi_msg="no (--with-libdbi)"
+ulib_pagespeed_msg="no (--with-page-speed)"
+ ulib_v8_msg="no (--with-v8-javascript)"
+ ulib_ipv6_msg="no (--with-ipv6)"
+ ulib_pch_msg="no (--enable-pch)"
+ ulib_LFS_msg="no (--enable-LFS)"
+ ulib_dbg_msg="no (--enable-debug)"
+ ulib_final_msg="no (--enable-final)"
+ ulib_zip_msg="no (--enable-zip)"
+ ulib_memp_msg="no (--enable-memory-pool)"
+# ulib_manual_msg="no (--enable-manual)"
# Add --{enable,disable,with,without}-feature options.
AC_COMPILATION_OPTIONS
@@ -411,40 +411,40 @@ LIBS="-ldl"
AC_CHECK_LIB(tcc,tcc_compile_string)
LIBS=${LIBS_SAVE}
-libz_version="None"
-pcre_version="None"
-ldap_version="None"
-expat_version="None"
-libssh_version="None"
-libcurl_version="None"
-ssl_version="None"
-libmagic_version="None"
-libmysql_version="None"
-libuuid_version="None"
-libevent_version="None"
-libxml2_version="None"
-libdbi_version="None"
-page_speed_version="None"
-v8_version="None"
+libz_version="no"
+pcre_version="no"
+ldap_version="no"
+expat_version="no"
+libssh_version="no"
+libcurl_version="no"
+ssl_version="no"
+libmagic_version="no"
+libmysql_version="no"
+libuuid_version="no"
+libevent_version="no"
+libxml2_version="no"
+libdbi_version="no"
+page_speed_version="no"
+v8_version="no"
AC_CHECK_PACKAGE
AC_SUBST(PRG_LDFLAGS)
-AM_CONDITIONAL(SSL, test "$HAVE_SSL" = "yes")
-AM_CONDITIONAL(SSH, test "$HAVE_SSH" = "yes")
+AM_CONDITIONAL(SSL, test "$USE_LIBSSL" = "yes")
AM_CONDITIONAL(SSL_TS, test "$HAVE_SSL_TS" = "yes")
-AM_CONDITIONAL(PCRE, test "$HAVE_PCRE" = "yes")
-AM_CONDITIONAL(LDAP, test "$HAVE_LDAP" = "yes")
-AM_CONDITIONAL(CURL, test "$HAVE_CURL" = "yes")
-AM_CONDITIONAL(LIBZ, test "$HAVE_LIBZ" = "yes")
-AM_CONDITIONAL(EXPAT, test "$HAVE_EXPAT" = "yes")
-AM_CONDITIONAL(MAGIC, test "$HAVE_MAGIC" = "yes")
-AM_CONDITIONAL(MYSQL, test "$HAVE_MYSQL" = "yes")
-AM_CONDITIONAL(DBI, test "$HAVE_DBI" = "yes")
-AM_CONDITIONAL(LIBEVENT, test "$HAVE_LIBEVENT" = "yes")
-AM_CONDITIONAL(LIBXML2, test "$HAVE_LIBXML2" = "yes")
-AM_CONDITIONAL(PAGE_SPEED, test "$HAVE_PAGE_SPEED" = "yes")
-AM_CONDITIONAL(V8, test "$HAVE_V8" = "yes")
+AM_CONDITIONAL(SSH, test "$USE_LIBSSH" = "yes")
+AM_CONDITIONAL(PCRE, test "$USE_LIBPCRE" = "yes")
+AM_CONDITIONAL(LDAP, test "$USE_LIBLDAP" = "yes")
+AM_CONDITIONAL(CURL, test "$USE_LIBCURL" = "yes")
+AM_CONDITIONAL(LIBZ, test "$USE_LIBZ" = "yes")
+AM_CONDITIONAL(EXPAT, test "$USE_LIBEXPAT" = "yes")
+AM_CONDITIONAL(MAGIC, test "$USE_LIBMAGIC" = "yes")
+AM_CONDITIONAL(MYSQL, test "$USE_LIBMYSQL" = "yes")
+AM_CONDITIONAL(DBI, test "$USE_LIBDBI" = "yes")
+AM_CONDITIONAL(LIBEVENT, test "$USE_LIBEVENT" = "yes")
+AM_CONDITIONAL(LIBXML2, test "$USE_LIBXML2" = "yes")
+AM_CONDITIONAL(PAGE_SPEED, test "$USE_PAGE_SPEED" = "yes")
+AM_CONDITIONAL(V8, test "$USE_LIBV8" = "yes")
AC_DEFINE_UNQUOTED(_FLEX_VERSION, "${flex_version}", [Flex version])
AC_DEFINE_UNQUOTED(_BISON_VERSION, "${bison_version}", [Bison version])
@@ -466,68 +466,76 @@ AC_DEFINE_UNQUOTED(_V8_VERSION, "${v8_version}", [V8 - version of Google V
LIBS_SAVE=${LIBS}
-if test "$HAVE_LIBZ" = "yes"; then
- ulib_libz_msg="enabled"
+if test "$USE_LIBZ" = "yes"; then
+ ulib_libz_msg="yes ( ${libz_version} )"
AC_CHECK_LIB(z,zlib_deflate_workspacesize)
if test "$ac_cv_lib_z_zlib_deflate_workspacesize" = "yes"; then
AC_DEFINE(U_ZLIB_DEFLATE_WORKSPACESIZE, 1, [Define if we have zlib with this function])
fi
+ if test "$enable_zip" = "yes"; then
+ ulib_zip_msg="enabled"
+ AC_DEFINE(ENABLE_ZIP, 1, [Define if enable ZIP support])
+ AM_CONDITIONAL(ZIP, true)
+ else
+ AC_DEFINE(DISABLE_ZIP, 1, [Define if disable ZIP support])
+ AM_CONDITIONAL(ZIP, false)
+ fi
fi
-if test "$HAVE_PCRE" = "yes"; then
- ulib_pcre_msg="enabled"
+if test "$USE_LIBPCRE" = "yes"; then
+ ulib_pcre_msg="yes ( ${pcre_version} )"
fi
-if test "$HAVE_CURL" = "yes"; then
- ulib_curl_msg="enabled"
+if test "$USE_LIBCURL" = "yes"; then
+ ulib_curl_msg="yes ( ${libcurl_version} )"
fi
-if test "$HAVE_LDAP" = "yes"; then
- ulib_ldap_msg="enabled"
+if test "$USE_LIBLDAP" = "yes"; then
+ ulib_ldap_msg="yes ( ${ldap_version} )"
fi
-if test "$HAVE_EXPAT" = "yes"; then
- ulib_expat_msg="enabled"
+if test "$USE_LIBEXPAT" = "yes"; then
+ ulib_expat_msg="yes ( ${expat_version} )"
fi
-if test "$HAVE_MAGIC" = "yes"; then
- ulib_magic_msg="enabled"
+if test "$USE_LIBMAGIC" = "yes"; then
+ ulib_magic_msg="yes ( ${libmagic_version} )"
fi
-if test "$HAVE_SSL" = "yes"; then
- ulib_ssl_msg="enabled"
+if test "$USE_LIBSSL" = "yes"; then
+ ulib_ssl_msg="yes ( ${ssl_version} )"
fi
-if test "$HAVE_SSH" = "yes"; then
- ulib_ssh_msg="enabled"
+if test "$USE_LIBSSH" = "yes"; then
+ ulib_ssh_msg="yes ( ${libssh_version} )"
fi
-if test "$HAVE_MYSQL" = "yes"; then
- ulib_mysql_msg="enabled"
+if test "$USE_LIBMYSQL" = "yes"; then
+ ulib_mysql_msg="yes ( ${libmysql_version} )"
fi
-if test "$HAVE_DBI" = "yes"; then
- ulib_dbi_msg="enabled"
+if test "$USE_LIBDBI" = "yes"; then
+ ulib_dbi_msg="yes ( ${libdbi_version} )"
fi
-if test "$HAVE_LIBUUID" = "yes"; then
- ulib_libuuid_msg="enabled"
+if test "$USE_LIBUUID" = "yes"; then
+ ulib_libuuid_msg="yes ( ${libuuid_version} )"
fi
-if test "$HAVE_LIBEVENT" = "yes"; then
- ulib_libevent_msg="enabled"
+if test "$USE_LIBEVENT" = "yes"; then
+ ulib_libevent_msg="yes ( ${libevent_version} )"
fi
-if test "$HAVE_LIBXML2" = "yes"; then
- ulib_libxml2_msg="enabled"
+if test "$USE_LIBXML2" = "yes"; then
+ ulib_libxml2_msg="yes ( ${libxml2_version} )"
fi
-if test "$HAVE_PAGE_SPEED" = "yes"; then
- ulib_pagespeed_msg="enabled"
+if test "$USE_PAGE_SPEED" = "yes"; then
+ ulib_pagespeed_msg="yes ( ${page_speed_version} )"
fi
-if test "$HAVE_V8" = "yes"; then
- ulib_v8_msg="enabled"
+if test "$USE_LIBV8" = "yes"; then
+ ulib_v8_msg="yes ( ${v8_version} )"
fi
case "$target_os" in
@@ -536,7 +544,7 @@ case "$target_os" in
LDFLAGS="${LDFLAGS} -Wl,--enable-auto-import"
fi
LIBS_SAVE="${LIBS_SAVE} -lwinmm -lws2_32"
- if test "$HAVE_SSL" = "yes"; then
+ if test "$USE_LIBSSL" = "yes"; then
LIBS_SAVE="${LIBS_SAVE} -lwsock32 -lgdi32 -lz";
fi
AM_CONDITIONAL(PTHREAD, false)
@@ -681,7 +689,9 @@ AM_CONDITIONAL(PLUGIN, test "$enable_shared" = "yes") # NB: if not don'
if test "$ost_cv_ipv6" = "yes"; then
ulib_ipv6_msg="enabled"
- AC_DEFINE(HAVE_IPV6, 1, [Define if enable ipv6 support])
+ AC_DEFINE(ENABLE_IPV6, 1, [Define if enable ipv6 support])
+else
+ AC_DEFINE(DISABLE_IPV6, 1, [Define if disable ipv6 support])
fi
# SECTION 12: checks for type characteristics
@@ -706,10 +716,10 @@ modules="mod_rpc mod_shib mod_stream mod_nocat mod_socket mod_scgi mod_fcgi mod_
# Remove modules that will not be compiles
-if test "$HAVE_EXPAT" != "yes"; then
+if test "$USE_EXPAT" != "yes"; then
modules=`echo $modules | sed s/mod_soap//`
fi
-if test "$HAVE_PCRE" != "yes"; then
+if test "$USE_PCRE" != "yes"; then
modules=`echo $modules | sed s/mod_proxy//`
fi
if test "x$ac_cv_lib_GeoIP_GeoIP_id_by_ipnum" != "xyes"; then
@@ -840,14 +850,6 @@ else
AM_CONDITIONAL(MEMORY_POOL, false)
fi
-if test "$enable_zip" = "yes"; then
- ulib_zip_msg="enabled"
- AC_DEFINE(HAVE_ZIP, 1, [Define if enable ZIP support])
- AM_CONDITIONAL(ZIP, true)
-else
- AM_CONDITIONAL(ZIP, false)
-fi
-
if test "$enable_LFS" = "yes"; then
ulib_LFS_msg="enabled"
CPPFLAGS="${CPPFLAGS} -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
@@ -927,7 +929,7 @@ if test "${ac_cv_c_compiler_gnu}" = "yes"; then
if test "$enable_debug" = "yes"; then
MAYBE_FLAGS="$MAYBE_FLAGS -Wp,-D_FORTIFY_SOURCE=2 -Wunsafe-loop-optimizations"
- if test "$HAVE_SSL" = "yes"; then
+ if test "$USE_LIBSSL" = "yes"; then
MAYBE_FLAGS="$MAYBE_FLAGS -Wno-unused-parameter"
fi
else
@@ -1037,6 +1039,8 @@ AC_SUBST(ULIB_LDFLAGS)
AC_SUBST(ULIB_CXXFLAGS)
AC_SUBST(ULIB_CPPFLAGS)
+AC_DEFINE_UNQUOTED(CXX_VAR, "${CXX}", [Compiler])
+AC_DEFINE_UNQUOTED(LD_VAR, "${LD}", [Linker])
AC_DEFINE_UNQUOTED(LIBS_VAR, "${LIBS}", [Libraries])
AC_DEFINE_UNQUOTED(CFLAGS_VAR, "${CFLAGS}", [C Flags])
AC_DEFINE_UNQUOTED(LDFLAGS_VAR, "${LDFLAGS}", [Linker Flags])
@@ -1073,62 +1077,52 @@ echo \
configure: Configured to build src/ulib/libulib:
ULib version: ${VERSION}
+ Build ULib: Shared=${enable_shared}, Static=${enable_static}
+
Host setup: ${host}
Install prefix: ${prefix}
Install plugin: ${pkglibexecdir}
Configuration data: ${sysconfdir}
+
Operating System: $os_version
C++ Compiler: ${CXX} ( $gcc_version )
- C Flags: ${CFLAGS}
- C++ Flags: ${CXXFLAGS}
- Preprocessor Flags: ${CPPFLAGS}
- Linker Flags: ${LDFLAGS}
Linker: ${LD} ( $ld_version )
- Libraries: ${LIBS}
Standard C library: ${libc_version}
Standard C++ library: ${stdgpp_version}
+ Libraries: ${LIBS}
+
+ C Flags: ${CFLAGS}
+ C++ Flags: ${CXXFLAGS}
+ Linker Flags: ${LDFLAGS}
+ Preprocessor Flags: ${CPPFLAGS}
- LFS support: ${ulib_LFS_msg}
debug support: ${ulib_dbg_msg}
- zip support: ${ulib_zip_msg}
final build mode: ${ulib_final_msg}
precompiled header: ${ulib_pch_msg}
memory pool support: ${ulib_memp_msg}
+ LFS support: ${ulib_LFS_msg}
ipv6 support: ${ulib_ipv6_msg}
+ zip support: ${ulib_zip_msg}
+
LIBZ support: ${ulib_libz_msg}
- LIBZ library: ${libz_version}
PCRE support: ${ulib_pcre_msg}
- PCRE library: ${pcre_version}
SSL support: ${ulib_ssl_msg}
- SSL library: ${ssl_version}
SSH support: ${ulib_ssh_msg}
- SSH library: ${libssh_version}
LDAP support: ${ulib_ldap_msg}
- LDAP library: ${ldap_version}
cURL support: ${ulib_curl_msg}
- cURL library: ${libcurl_version}
XML support: ${ulib_expat_msg}
- Expat library: ${expat_version}
MAGIC support: ${ulib_magic_msg}
- MAGIC library: ${libmagic_version}
MySQL support: ${ulib_mysql_msg}
- MySQL library: ${libmysql_version}
DBI support: ${ulib_dbi_msg}
- DBI library: ${libdbi_version}
libuuid support: ${ulib_libuuid_msg}
- libuuid library: ${libuuid_version}
libevent support: ${ulib_libevent_msg}
- libevent library: ${libevent_version}
libxml2 support: ${ulib_libxml2_msg}
- libxml2 library: ${libxml2_version}
Page-Speed support: ${ulib_pagespeed_msg}
- Page-Speed SDK: ${page_speed_version}
V8 JavaScript support: ${ulib_v8_msg}
- V8 JavaScript: ${v8_version}
+
LEX/YACC support: ${ulib_parser_msg}
Lexical analyzer: ${LEX} ( ${flex_version} )
Parser generator: ${YACC} ( ${bison_version} )
- Build ULib: Shared=${enable_shared}, Static=${enable_static}
See include/ulib/internal/config.h for further configuration information.
------------------------------------------------------------------------"
@@ -1194,11 +1188,12 @@ AC_OUTPUT(Makefile \
# src/ulib/base/Makefile src/ulib/debug/Makefile \
# ulib-config ,[chmod a+x ulib-config] )
-# Common C++
+awk -f configure_log.awk config.log > include/ulib/internal/config1.h
+awk -f configure_h.awk include/ulib/internal/config.h > include/ulib/internal/config2.h
cd include/ulib/internal
-mv config.h config.tmp
-sed -e s!"@thrprefix@/thread.h"!"thread.h"! < config.tmp > config.h
-rm -f config.tmp
+sed -e s!"@thrprefix@/thread.h"!"thread.h"! < config.h > config3.h # Common C++
+cat config3.h config2.h config1.h > config.h
+rm -f config3.h config2.h config1.h
cd ../../..
echo
@@ -1208,7 +1203,7 @@ CPPFLAGS="-DHAVE_CONFIG_H -I${srcdir}/include ${CPPFLAGS}"
if test "$enable_pch" = "yes" ; then
AC_MSG_CHECKING(build precompiled headers for ${srcdir}/include/ulib/all.h)
- echo "rm -f ${srcdir}/include/ulib/all.h.gch" > ${srcdir}/PCH.cmd
+ echo "rm -f ${srcdir}/include/ulib/all.h.gch" > ${srcdir}/PCH.cmd
echo "${CXX} ${CPPFLAGS} ${CXXFLAGS} -c ${srcdir}/include/ulib/all.h -o ${srcdir}/include/ulib/all.h.gch" >> ${srcdir}/PCH.cmd
rm -f ${srcdir}/include/ulib/all.h.gch
${CXX} ${CPPFLAGS} ${CXXFLAGS} -c ${srcdir}/include/ulib/all.h -o ${srcdir}/include/ulib/all.h.gch
39 configure_h.awk
View
@@ -0,0 +1,39 @@
+#
+# OpenVPN -- An application to securely tunnel IP networks
+# over a single UDP port, with support for SSL/TLS-based
+# session authentication and key exchange,
+# packet encryption, packet authentication, and
+# packet compression.
+#
+# Copyright (C) 2010 David Sommerseth <dazo@users.sourceforge.net>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2
+# as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program (see the file COPYING included with this
+# distribution); if not, write to the Free Software Foundation, Inc.,
+# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+#
+# This script will build up a line which can be included into a C program.
+# The line will contain all interesting #define statements from f.ex. ./config.h
+#
+
+BEGIN {
+ printf ("#define CONFIGURE_DEFINES \"")
+}
+
+/^#define (ENABLE|DISABLE|DEPRECATED|USE)_/ {
+ printf (" %s", $2)
+}
+
+END {
+ printf ("\"\n\n")
+}
33 configure_log.awk
View
@@ -0,0 +1,33 @@
+#
+# OpenVPN -- An application to securely tunnel IP networks
+# over a single UDP port, with support for SSL/TLS-based
+# session authentication and key exchange,
+# packet encryption, packet authentication, and
+# packet compression.
+#
+# Copyright (C) 2010 David Sommerseth <dazo@users.sourceforge.net>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2
+# as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program (see the file COPYING included with this
+# distribution); if not, write to the Free Software Foundation, Inc.,
+# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+#
+# This script will build up a line which can be included into a C program.
+# The line will only contain the first entry of the ./configure line from
+# ./config.log.
+#
+
+/\$ (.*)\/configure/ {
+ printf ("#define CONFIGURE_CALL \"%s\"\n\n", $0)
+ exit 0
+}
30 contrib/HCSP/Makefile.in
View
@@ -165,22 +165,7 @@ FTPDIR = @FTPDIR@
GENERIC_LIBRARY_VERSION = @GENERIC_LIBRARY_VERSION@
GETOPT_LIBS = @GETOPT_LIBS@
GREP = @GREP@
-HAVE_CURL = @HAVE_CURL@
-HAVE_DBI = @HAVE_DBI@
-HAVE_EXPAT = @HAVE_EXPAT@
-HAVE_LDAP = @HAVE_LDAP@
-HAVE_LIBEVENT = @HAVE_LIBEVENT@
-HAVE_LIBUUID = @HAVE_LIBUUID@
-HAVE_LIBXML2 = @HAVE_LIBXML2@
-HAVE_LIBZ = @HAVE_LIBZ@
-HAVE_MAGIC = @HAVE_MAGIC@
-HAVE_MYSQL = @HAVE_MYSQL@
-HAVE_PAGE_SPEED = @HAVE_PAGE_SPEED@
-HAVE_PCRE = @HAVE_PCRE@
-HAVE_SSH = @HAVE_SSH@
-HAVE_SSL = @HAVE_SSL@
HAVE_SSL_TS = @HAVE_SSL_TS@
-HAVE_V8 = @HAVE_V8@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -237,6 +222,21 @@ ULIB_CPPFLAGS = @ULIB_CPPFLAGS@
ULIB_CXXFLAGS = @ULIB_CXXFLAGS@
ULIB_LDFLAGS = @ULIB_LDFLAGS@
ULIB_LIBS = @ULIB_LIBS@
+USE_LIBCURL = @USE_LIBCURL@
+USE_LIBDBI = @USE_LIBDBI@
+USE_LIBEVENT = @USE_LIBEVENT@
+USE_LIBEXPAT = @USE_LIBEXPAT@
+USE_LIBLDAP = @USE_LIBLDAP@
+USE_LIBMAGIC = @USE_LIBMAGIC@
+USE_LIBMYSQL = @USE_LIBMYSQL@
+USE_LIBPCRE = @USE_LIBPCRE@
+USE_LIBSSH = @USE_LIBSSH@
+USE_LIBSSL = @USE_LIBSSL@
+USE_LIBUUID = @USE_LIBUUID@
+USE_LIBV8 = @USE_LIBV8@
+USE_LIBXML2 = @USE_LIBXML2@
+USE_LIBZ = @USE_LIBZ@
+USE_PAGE_SPEED = @USE_PAGE_SPEED@
VERSION = @VERSION@
WINDRES = @WINDRES@
XLEX = @XLEX@
30 contrib/Makefile.in
View
@@ -153,22 +153,7 @@ FTPDIR = @FTPDIR@
GENERIC_LIBRARY_VERSION = @GENERIC_LIBRARY_VERSION@
GETOPT_LIBS = @GETOPT_LIBS@
GREP = @GREP@
-HAVE_CURL = @HAVE_CURL@
-HAVE_DBI = @HAVE_DBI@
-HAVE_EXPAT = @HAVE_EXPAT@
-HAVE_LDAP = @HAVE_LDAP@
-HAVE_LIBEVENT = @HAVE_LIBEVENT@
-HAVE_LIBUUID = @HAVE_LIBUUID@
-HAVE_LIBXML2 = @HAVE_LIBXML2@
-HAVE_LIBZ = @HAVE_LIBZ@
-HAVE_MAGIC = @HAVE_MAGIC@
-HAVE_MYSQL = @HAVE_MYSQL@
-HAVE_PAGE_SPEED = @HAVE_PAGE_SPEED@
-HAVE_PCRE = @HAVE_PCRE@
-HAVE_SSH = @HAVE_SSH@
-HAVE_SSL = @HAVE_SSL@
HAVE_SSL_TS = @HAVE_SSL_TS@
-HAVE_V8 = @HAVE_V8@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -225,6 +210,21 @@ ULIB_CPPFLAGS = @ULIB_CPPFLAGS@
ULIB_CXXFLAGS = @ULIB_CXXFLAGS@
ULIB_LDFLAGS = @ULIB_LDFLAGS@
ULIB_LIBS = @ULIB_LIBS@
+USE_LIBCURL = @USE_LIBCURL@
+USE_LIBDBI = @USE_LIBDBI@
+USE_LIBEVENT = @USE_LIBEVENT@
+USE_LIBEXPAT = @USE_LIBEXPAT@
+USE_LIBLDAP = @USE_LIBLDAP@
+USE_LIBMAGIC = @USE_LIBMAGIC@
+USE_LIBMYSQL = @USE_LIBMYSQL@
+USE_LIBPCRE = @USE_LIBPCRE@
+USE_LIBSSH = @USE_LIBSSH@
+USE_LIBSSL = @USE_LIBSSL@
+USE_LIBUUID = @USE_LIBUUID@
+USE_LIBV8 = @USE_LIBV8@
+USE_LIBXML2 = @USE_LIBXML2@
+USE_LIBZ = @USE_LIBZ@
+USE_PAGE_SPEED = @USE_PAGE_SPEED@
VERSION = @VERSION@
WINDRES = @WINDRES@
XLEX = @XLEX@
30 contrib/RSIGN/Makefile.in
View
@@ -143,22 +143,7 @@ FTPDIR = @FTPDIR@
GENERIC_LIBRARY_VERSION = @GENERIC_LIBRARY_VERSION@
GETOPT_LIBS = @GETOPT_LIBS@
GREP = @GREP@
-HAVE_CURL = @HAVE_CURL@
-HAVE_DBI = @HAVE_DBI@
-HAVE_EXPAT = @HAVE_EXPAT@
-HAVE_LDAP = @HAVE_LDAP@
-HAVE_LIBEVENT = @HAVE_LIBEVENT@
-HAVE_LIBUUID = @HAVE_LIBUUID@
-HAVE_LIBXML2 = @HAVE_LIBXML2@
-HAVE_LIBZ = @HAVE_LIBZ@
-HAVE_MAGIC = @HAVE_MAGIC@
-HAVE_MYSQL = @HAVE_MYSQL@
-HAVE_PAGE_SPEED = @HAVE_PAGE_SPEED@
-HAVE_PCRE = @HAVE_PCRE@
-HAVE_SSH = @HAVE_SSH@
-HAVE_SSL = @HAVE_SSL@
HAVE_SSL_TS = @HAVE_SSL_TS@
-HAVE_V8 = @HAVE_V8@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -215,6 +200,21 @@ ULIB_CPPFLAGS = @ULIB_CPPFLAGS@
ULIB_CXXFLAGS = @ULIB_CXXFLAGS@
ULIB_LDFLAGS = @ULIB_LDFLAGS@
ULIB_LIBS = @ULIB_LIBS@
+USE_LIBCURL = @USE_LIBCURL@
+USE_LIBDBI = @USE_LIBDBI@
+USE_LIBEVENT = @USE_LIBEVENT@
+USE_LIBEXPAT = @USE_LIBEXPAT@
+USE_LIBLDAP = @USE_LIBLDAP@
+USE_LIBMAGIC = @USE_LIBMAGIC@
+USE_LIBMYSQL = @USE_LIBMYSQL@
+USE_LIBPCRE = @USE_LIBPCRE@
+USE_LIBSSH = @USE_LIBSSH@
+USE_LIBSSL = @USE_LIBSSL@
+USE_LIBUUID = @USE_LIBUUID@
+USE_LIBV8 = @USE_LIBV8@
+USE_LIBXML2 = @USE_LIBXML2@
+USE_LIBZ = @USE_LIBZ@
+USE_PAGE_SPEED = @USE_PAGE_SPEED@
VERSION = @VERSION@
WINDRES = @WINDRES@
XLEX = @XLEX@
30 contrib/signer/Makefile.in
View
@@ -142,22 +142,7 @@ FTPDIR = @FTPDIR@
GENERIC_LIBRARY_VERSION = @GENERIC_LIBRARY_VERSION@
GETOPT_LIBS = @GETOPT_LIBS@
GREP = @GREP@
-HAVE_CURL = @HAVE_CURL@
-HAVE_DBI = @HAVE_DBI@
-HAVE_EXPAT = @HAVE_EXPAT@
-HAVE_LDAP = @HAVE_LDAP@
-HAVE_LIBEVENT = @HAVE_LIBEVENT@
-HAVE_LIBUUID = @HAVE_LIBUUID@
-HAVE_LIBXML2 = @HAVE_LIBXML2@
-HAVE_LIBZ = @HAVE_LIBZ@
-HAVE_MAGIC = @HAVE_MAGIC@
-HAVE_MYSQL = @HAVE_MYSQL@
-HAVE_PAGE_SPEED = @HAVE_PAGE_SPEED@
-HAVE_PCRE = @HAVE_PCRE@
-HAVE_SSH = @HAVE_SSH@
-HAVE_SSL = @HAVE_SSL@
HAVE_SSL_TS = @HAVE_SSL_TS@
-HAVE_V8 = @HAVE_V8@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -214,6 +199,21 @@ ULIB_CPPFLAGS = @ULIB_CPPFLAGS@
ULIB_CXXFLAGS = @ULIB_CXXFLAGS@
ULIB_LDFLAGS = @ULIB_LDFLAGS@
ULIB_LIBS = @ULIB_LIBS@
+USE_LIBCURL = @USE_LIBCURL@
+USE_LIBDBI = @USE_LIBDBI@
+USE_LIBEVENT = @USE_LIBEVENT@
+USE_LIBEXPAT = @USE_LIBEXPAT@
+USE_LIBLDAP = @USE_LIBLDAP@
+USE_LIBMAGIC = @USE_LIBMAGIC@
+USE_LIBMYSQL = @USE_LIBMYSQL@
+USE_LIBPCRE = @USE_LIBPCRE@
+USE_LIBSSH = @USE_LIBSSH@
+USE_LIBSSL = @USE_LIBSSL@
+USE_LIBUUID = @USE_LIBUUID@
+USE_LIBV8 = @USE_LIBV8@
+USE_LIBXML2 = @USE_LIBXML2@
+USE_LIBZ = @USE_LIBZ@
+USE_PAGE_SPEED = @USE_PAGE_SPEED@
VERSION = @VERSION@
WINDRES = @WINDRES@
XLEX = @XLEX@
30 doc/Makefile.in
View
@@ -111,22 +111,7 @@ FTPDIR = @FTPDIR@
GENERIC_LIBRARY_VERSION = @GENERIC_LIBRARY_VERSION@
GETOPT_LIBS = @GETOPT_LIBS@
GREP = @GREP@
-HAVE_CURL = @HAVE_CURL@
-HAVE_DBI = @HAVE_DBI@
-HAVE_EXPAT = @HAVE_EXPAT@
-HAVE_LDAP = @HAVE_LDAP@
-HAVE_LIBEVENT = @HAVE_LIBEVENT@
-HAVE_LIBUUID = @HAVE_LIBUUID@
-HAVE_LIBXML2 = @HAVE_LIBXML2@
-HAVE_LIBZ = @HAVE_LIBZ@
-HAVE_MAGIC = @HAVE_MAGIC@
-HAVE_MYSQL = @HAVE_MYSQL@
-HAVE_PAGE_SPEED = @HAVE_PAGE_SPEED@
-HAVE_PCRE = @HAVE_PCRE@
-HAVE_SSH = @HAVE_SSH@
-HAVE_SSL = @HAVE_SSL@
HAVE_SSL_TS = @HAVE_SSL_TS@
-HAVE_V8 = @HAVE_V8@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -183,6 +168,21 @@ ULIB_CPPFLAGS = @ULIB_CPPFLAGS@
ULIB_CXXFLAGS = @ULIB_CXXFLAGS@
ULIB_LDFLAGS = @ULIB_LDFLAGS@
ULIB_LIBS = @ULIB_LIBS@
+USE_LIBCURL = @USE_LIBCURL@
+USE_LIBDBI = @USE_LIBDBI@
+USE_LIBEVENT = @USE_LIBEVENT@
+USE_LIBEXPAT = @USE_LIBEXPAT@
+USE_LIBLDAP = @USE_LIBLDAP@
+USE_LIBMAGIC = @USE_LIBMAGIC@
+USE_LIBMYSQL = @USE_LIBMYSQL@
+USE_LIBPCRE = @USE_LIBPCRE@
+USE_LIBSSH = @USE_LIBSSH@
+USE_LIBSSL = @USE_LIBSSL@
+USE_LIBUUID = @USE_LIBUUID@
+USE_LIBV8 = @USE_LIBV8@
+USE_LIBXML2 = @USE_LIBXML2@
+USE_LIBZ = @USE_LIBZ@
+USE_PAGE_SPEED = @USE_PAGE_SPEED@
VERSION = @VERSION@
WINDRES = @WINDRES@
XLEX = @XLEX@
30 examples/IR/Makefile.in
View
@@ -231,22 +231,7 @@ FTPDIR = @FTPDIR@
GENERIC_LIBRARY_VERSION = @GENERIC_LIBRARY_VERSION@
GETOPT_LIBS = @GETOPT_LIBS@
GREP = @GREP@
-HAVE_CURL = @HAVE_CURL@
-HAVE_DBI = @HAVE_DBI@
-HAVE_EXPAT = @HAVE_EXPAT@
-HAVE_LDAP = @HAVE_LDAP@
-HAVE_LIBEVENT = @HAVE_LIBEVENT@
-HAVE_LIBUUID = @HAVE_LIBUUID@
-HAVE_LIBXML2 = @HAVE_LIBXML2@
-HAVE_LIBZ = @HAVE_LIBZ@
-HAVE_MAGIC = @HAVE_MAGIC@
-HAVE_MYSQL = @HAVE_MYSQL@
-HAVE_PAGE_SPEED = @HAVE_PAGE_SPEED@
-HAVE_PCRE = @HAVE_PCRE@
-HAVE_SSH = @HAVE_SSH@
-HAVE_SSL = @HAVE_SSL@
HAVE_SSL_TS = @HAVE_SSL_TS@
-HAVE_V8 = @HAVE_V8@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -303,6 +288,21 @@ ULIB_CPPFLAGS = @ULIB_CPPFLAGS@
ULIB_CXXFLAGS = @ULIB_CXXFLAGS@
ULIB_LDFLAGS = @ULIB_LDFLAGS@
ULIB_LIBS = @ULIB_LIBS@
+USE_LIBCURL = @USE_LIBCURL@
+USE_LIBDBI = @USE_LIBDBI@
+USE_LIBEVENT = @USE_LIBEVENT@
+USE_LIBEXPAT = @USE_LIBEXPAT@
+USE_LIBLDAP = @USE_LIBLDAP@
+USE_LIBMAGIC = @USE_LIBMAGIC@
+USE_LIBMYSQL = @USE_LIBMYSQL@
+USE_LIBPCRE = @USE_LIBPCRE@
+USE_LIBSSH = @USE_LIBSSH@
+USE_LIBSSL = @USE_LIBSSL@
+USE_LIBUUID = @USE_LIBUUID@
+USE_LIBV8 = @USE_LIBV8@
+USE_LIBXML2 = @USE_LIBXML2@
+USE_LIBZ = @USE_LIBZ@
+USE_PAGE_SPEED = @USE_PAGE_SPEED@
VERSION = @VERSION@
WINDRES = @WINDRES@
XLEX = @XLEX@
30 examples/Makefile.in
View
@@ -161,22 +161,7 @@ FTPDIR = @FTPDIR@
GENERIC_LIBRARY_VERSION = @GENERIC_LIBRARY_VERSION@
GETOPT_LIBS = @GETOPT_LIBS@
GREP = @GREP@
-HAVE_CURL = @HAVE_CURL@
-HAVE_DBI = @HAVE_DBI@
-HAVE_EXPAT = @HAVE_EXPAT@
-HAVE_LDAP = @HAVE_LDAP@
-HAVE_LIBEVENT = @HAVE_LIBEVENT@
-HAVE_LIBUUID = @HAVE_LIBUUID@
-HAVE_LIBXML2 = @HAVE_LIBXML2@
-HAVE_LIBZ = @HAVE_LIBZ@
-HAVE_MAGIC = @HAVE_MAGIC@
-HAVE_MYSQL = @HAVE_MYSQL@
-HAVE_PAGE_SPEED = @HAVE_PAGE_SPEED@
-HAVE_PCRE = @HAVE_PCRE@
-HAVE_SSH = @HAVE_SSH@
-HAVE_SSL = @HAVE_SSL@
HAVE_SSL_TS = @HAVE_SSL_TS@
-HAVE_V8 = @HAVE_V8@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -233,6 +218,21 @@ ULIB_CPPFLAGS = @ULIB_CPPFLAGS@
ULIB_CXXFLAGS = @ULIB_CXXFLAGS@
ULIB_LDFLAGS = @ULIB_LDFLAGS@
ULIB_LIBS = @ULIB_LIBS@
+USE_LIBCURL = @USE_LIBCURL@
+USE_LIBDBI = @USE_LIBDBI@
+USE_LIBEVENT = @USE_LIBEVENT@
+USE_LIBEXPAT = @USE_LIBEXPAT@
+USE_LIBLDAP = @USE_LIBLDAP@
+USE_LIBMAGIC = @USE_LIBMAGIC@
+USE_LIBMYSQL = @USE_LIBMYSQL@
+USE_LIBPCRE = @USE_LIBPCRE@
+USE_LIBSSH = @USE_LIBSSH@
+USE_LIBSSL = @USE_LIBSSL@
+USE_LIBUUID = @USE_LIBUUID@
+USE_LIBV8 = @USE_LIBV8@
+USE_LIBXML2 = @USE_LIBXML2@
+USE_LIBZ = @USE_LIBZ@
+USE_PAGE_SPEED = @USE_PAGE_SPEED@
VERSION = @VERSION@
WINDRES = @WINDRES@
XLEX = @XLEX@
30 examples/PEC_log/Makefile.in
View
@@ -240,22 +240,7 @@ FTPDIR = @FTPDIR@
GENERIC_LIBRARY_VERSION = @GENERIC_LIBRARY_VERSION@
GETOPT_LIBS = @GETOPT_LIBS@
GREP = @GREP@
-HAVE_CURL = @HAVE_CURL@
-HAVE_DBI = @HAVE_DBI@
-HAVE_EXPAT = @HAVE_EXPAT@
-HAVE_LDAP = @HAVE_LDAP@
-HAVE_LIBEVENT = @HAVE_LIBEVENT@
-HAVE_LIBUUID = @HAVE_LIBUUID@
-HAVE_LIBXML2 = @HAVE_LIBXML2@
-HAVE_LIBZ = @HAVE_LIBZ@
-HAVE_MAGIC = @HAVE_MAGIC@
-HAVE_MYSQL = @HAVE_MYSQL@
-HAVE_PAGE_SPEED = @HAVE_PAGE_SPEED@
-HAVE_PCRE = @HAVE_PCRE@
-HAVE_SSH = @HAVE_SSH@
-HAVE_SSL = @HAVE_SSL@
HAVE_SSL_TS = @HAVE_SSL_TS@
-HAVE_V8 = @HAVE_V8@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -312,6 +297,21 @@ ULIB_CPPFLAGS = @ULIB_CPPFLAGS@
ULIB_CXXFLAGS = @ULIB_CXXFLAGS@
ULIB_LDFLAGS = @ULIB_LDFLAGS@
ULIB_LIBS = @ULIB_LIBS@
+USE_LIBCURL = @USE_LIBCURL@
+USE_LIBDBI = @USE_LIBDBI@
+USE_LIBEVENT = @USE_LIBEVENT@
+USE_LIBEXPAT = @USE_LIBEXPAT@
+USE_LIBLDAP = @USE_LIBLDAP@
+USE_LIBMAGIC = @USE_LIBMAGIC@
+USE_LIBMYSQL = @USE_LIBMYSQL@
+USE_LIBPCRE = @USE_LIBPCRE@
+USE_LIBSSH = @USE_LIBSSH@
+USE_LIBSSL = @USE_LIBSSL@
+USE_LIBUUID = @USE_LIBUUID@
+USE_LIBV8 = @USE_LIBV8@
+USE_LIBXML2 = @USE_LIBXML2@
+USE_LIBZ = @USE_LIBZ@
+USE_PAGE_SPEED = @USE_PAGE_SPEED@
VERSION = @VERSION@
WINDRES = @WINDRES@
XLEX = @XLEX@
30 examples/XAdES/Makefile.in
View
@@ -185,22 +185,7 @@ FTPDIR = @FTPDIR@
GENERIC_LIBRARY_VERSION = @GENERIC_LIBRARY_VERSION@
GETOPT_LIBS = @GETOPT_LIBS@
GREP = @GREP@
-HAVE_CURL = @HAVE_CURL@
-HAVE_DBI = @HAVE_DBI@
-HAVE_EXPAT = @HAVE_EXPAT@
-HAVE_LDAP = @HAVE_LDAP@
-HAVE_LIBEVENT = @HAVE_LIBEVENT@
-HAVE_LIBUUID = @HAVE_LIBUUID@
-HAVE_LIBXML2 = @HAVE_LIBXML2@
-HAVE_LIBZ = @HAVE_LIBZ@
-HAVE_MAGIC = @HAVE_MAGIC@
-HAVE_MYSQL = @HAVE_MYSQL@
-HAVE_PAGE_SPEED = @HAVE_PAGE_SPEED@
-HAVE_PCRE = @HAVE_PCRE@
-HAVE_SSH = @HAVE_SSH@
-HAVE_SSL = @HAVE_SSL@
HAVE_SSL_TS = @HAVE_SSL_TS@
-HAVE_V8 = @HAVE_V8@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -257,6 +242,21 @@ ULIB_CPPFLAGS = @ULIB_CPPFLAGS@
ULIB_CXXFLAGS = @ULIB_CXXFLAGS@
ULIB_LDFLAGS = @ULIB_LDFLAGS@
ULIB_LIBS = @ULIB_LIBS@
+USE_LIBCURL = @USE_LIBCURL@
+USE_LIBDBI = @USE_LIBDBI@
+USE_LIBEVENT = @USE_LIBEVENT@
+USE_LIBEXPAT = @USE_LIBEXPAT@
+USE_LIBLDAP = @USE_LIBLDAP@
+USE_LIBMAGIC = @USE_LIBMAGIC@
+USE_LIBMYSQL = @USE_LIBMYSQL@
+USE_LIBPCRE = @USE_LIBPCRE@
+USE_LIBSSH = @USE_LIBSSH@
+USE_LIBSSL = @USE_LIBSSL@
+USE_LIBUUID = @USE_LIBUUID@
+USE_LIBV8 = @USE_LIBV8@
+USE_LIBXML2 = @USE_LIBXML2@
+USE_LIBZ = @USE_LIBZ@
+USE_PAGE_SPEED = @USE_PAGE_SPEED@
VERSION = @VERSION@
WINDRES = @WINDRES@
XLEX = @XLEX@
2  examples/XAdES/client.cpp
View
@@ -350,7 +350,7 @@ class Application : public UApplication {
// -----------------------------------------------------------------------------------------------
// client XAdES - configuration parameters
// -----------------------------------------------------------------------------------------------
- // USE_IPV6 flag to indicate use of ipv6
+ // ENABLE_IPV6 flag to indicate use of ipv6
// SERVER host name or ip address for server
// PORT port number for the server
// -----------------------------------------------------------------------------------------------
30 examples/csp/Makefile.in
View
@@ -157,22 +157,7 @@ FTPDIR = @FTPDIR@
GENERIC_LIBRARY_VERSION = @GENERIC_LIBRARY_VERSION@
GETOPT_LIBS = @GETOPT_LIBS@
GREP = @GREP@
-HAVE_CURL = @HAVE_CURL@
-HAVE_DBI = @HAVE_DBI@
-HAVE_EXPAT = @HAVE_EXPAT@
-HAVE_LDAP = @HAVE_LDAP@
-HAVE_LIBEVENT = @HAVE_LIBEVENT@
-HAVE_LIBUUID = @HAVE_LIBUUID@
-HAVE_LIBXML2 = @HAVE_LIBXML2@
-HAVE_LIBZ = @HAVE_LIBZ@
-HAVE_MAGIC = @HAVE_MAGIC@
-HAVE_MYSQL = @HAVE_MYSQL@
-HAVE_PAGE_SPEED = @HAVE_PAGE_SPEED@
-HAVE_PCRE = @HAVE_PCRE@
-HAVE_SSH = @HAVE_SSH@
-HAVE_SSL = @HAVE_SSL@
HAVE_SSL_TS = @HAVE_SSL_TS@
-HAVE_V8 = @HAVE_V8@