sync

stefanocasazza · Jul 29, 2017 · 493e28d · 493e28d
1 parent 01e5f28
commit 493e28d
Show file tree

Hide file tree

Showing 75 changed files with 797 additions and 343 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -3,7 +3,10 @@
 AUTOMAKE_OPTIONS = no-dependencies ## dist-shar dist-zip
 ACLOCAL_AMFLAGS = -I m4
 
-EXTRA_DIST = cdb configure.help TODO LICENSE* README* *.spec* \
+configfiles = userver.service
+
+EXTRA_DIST = $(configfiles:%=%.in) \
+				 cdb configure.help TODO LICENSE* README* *.spec* \
 	 			 ULib.m4 rpm.sh rpmpkgreq.lst rpmpkgreq.lst.suse openwrt \
 	 			 doc/Doxyfile doc/readme.txt shtool *.awk .travis.yml autogen.sh nativejson-benchmark \
 				 fuzz/http1-corpus fuzz/http2-corpus fuzz/build_libFuzzer.sh fuzz/Makefile.in fuzz/Makefile.am fuzz/uclient_fuzzer.cpp fuzz/uclient.cfg

diff --git a/Makefile.in b/Makefile.in
@@ -118,7 +118,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/ulib/internal/config.h
-CONFIG_CLEAN_FILES = rpm.sh ULib.spec
+CONFIG_CLEAN_FILES = rpm.sh ULib.spec userver.service
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -207,7 +207,7 @@ ETAGS = etags
 CTAGS = ctags
 CSCOPE = cscope
 am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/ULib.spec.in \
-	$(srcdir)/rpm.sh.in \
+	$(srcdir)/rpm.sh.in $(srcdir)/userver.service.in \
 	$(top_srcdir)/include/ulib/internal/config.h.in AUTHORS \
 	ChangeLog INSTALL NEWS README THANKS TODO compile config.guess \
 	config.sub install-sh ltmain.sh missing ylwrap
@@ -371,6 +371,7 @@ ULIB = @ULIB@
 ULIBS = @ULIBS@
 ULIB_LIBS = @ULIB_LIBS@
 ULIB_MODULEDIR = @ULIB_MODULEDIR@
+ULIB_PREFIXDIR = @ULIB_PREFIXDIR@
 ULIB_SYSCONFDIR = @ULIB_SYSCONFDIR@
 ULIB_VERSION = @ULIB_VERSION@
 USP_FLAGS = @USP_FLAGS@
@@ -446,7 +447,9 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = no-dependencies ## dist-shar dist-zip
 ACLOCAL_AMFLAGS = -I m4
-EXTRA_DIST = cdb configure.help TODO LICENSE* README* *.spec* \
+configfiles = userver.service
+EXTRA_DIST = $(configfiles:%=%.in) \
+				 cdb configure.help TODO LICENSE* README* *.spec* \
 	 			 ULib.m4 rpm.sh rpmpkgreq.lst rpmpkgreq.lst.suse openwrt \
 	 			 doc/Doxyfile doc/readme.txt shtool *.awk .travis.yml autogen.sh nativejson-benchmark \
 				 fuzz/http1-corpus fuzz/http2-corpus fuzz/build_libFuzzer.sh fuzz/Makefile.in fuzz/Makefile.am fuzz/uclient_fuzzer.cpp fuzz/uclient.cfg
@@ -512,6 +515,8 @@ rpm.sh: $(top_builddir)/config.status $(srcdir)/rpm.sh.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 ULib.spec: $(top_builddir)/config.status $(srcdir)/ULib.spec.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
+userver.service: $(top_builddir)/config.status $(srcdir)/userver.service.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
 
 mostlyclean-libtool:
 	-rm -f *.lo

diff --git a/ULib.spec.in b/ULib.spec.in
@@ -36,9 +36,8 @@ make LDFLAGS="-s"
 %install
 rm -rf %{buildroot}
 %makeinstall
-mkdir -p %{_sysconfdir}/ulib
 mkdir -p %{buildroot}/usr/share/aclocal
-mkdir -p %{buildroot}/usr/libexec/ulib/usp
+mkdir -p %{buildroot}/usr/libexec/usp
 
 %clean
 rm -rf %{buildroot}
@@ -50,9 +49,9 @@ rm -rf %{buildroot}
 %{_bindir}/userver_*
 %{_libdir}/*.so.*
 %{_sysconfdir}/*.cfg*
-%{_libexecdir}/ulib/mod_*.*
-%{_libexecdir}/ulib/usp/*.*
-%dir %{_libexecdir}/ulib/usp
+%{_libexecdir}/mod_*.*
+%{_libexecdir}/usp/*.*
+%dir %{_libexecdir}/usp
 
 %files devel
 %defattr(-,root,root,-)
@@ -74,13 +73,13 @@ rm -rf %{buildroot}
 %{_includedir}/ulib/flex/flexer_head.ll
 %{_datadir}/aclocal/*.m4
 %{_libdir}/pkgconfig/*.pc
-%{_libexecdir}/ulib/mod_*.a
-%{_libexecdir}/ulib/mod_*.so
-%{_libexecdir}/ulib/mod_*.la
-%{_libexecdir}/ulib/usp/*.a
-%{_libexecdir}/ulib/usp/*.so
-%{_libexecdir}/ulib/usp/*.la
-%dir %{_libexecdir}/ulib/usp
+%{_libexecdir}/mod_*.a
+%{_libexecdir}/mod_*.so
+%{_libexecdir}/mod_*.la
+%{_libexecdir}/usp/*.a
+%{_libexecdir}/usp/*.so
+%{_libexecdir}/usp/*.la
+%dir %{_libexecdir}/usp
 
 %post -p /sbin/ldconfig
 

diff --git a/configure b/configure
@@ -639,6 +639,7 @@ am__EXEEXT_TRUE
 LTLIBOBJS
 ULIB_SYSCONFDIR
 ULIB_MODULEDIR
+ULIB_PREFIXDIR
 RPM_CONFIGURE
 STD_GNU11
 USP_LDFLAGS
@@ -32833,7 +32834,11 @@ if test -n "$posix4_lib"; then
    ULIB_LIBS="$ULIB_LIBS $posix4_lib";
 fi
 if test -n "$plib"; then
-   ULIB_LIBS="$ULIB_LIBS -Wl,--no-as-needed $plib";
+	if test "$with_gnu_ld" = "yes" -a "$enable_new_ldflags" = "yes"; then
+		ULIB_LIBS="$ULIB_LIBS -Wl,--no-as-needed $plib";
+	else
+		ULIB_LIBS="$ULIB_LIBS $plib";
+	fi
 fi
 if test "$enable_coverage" = "yes"; then
 	ULIB_LIBS="$ULIB_LIBS -lgcov"
@@ -33219,6 +33224,8 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
+ULIB_PREFIXDIR="$u_prefixdir"
+
 ULIB_MODULEDIR="$u_libexecdir"
 
 ULIB_SYSCONFDIR="$u_sysconfdir"
@@ -33350,7 +33357,7 @@ See include/ulib/internal/config.h for further configuration information
 
 # SECTION 16: `AC_CONFIG_FILES([FILE...])
 
-ac_config_files="$ac_config_files Makefile rpm.sh ULib.spec m4/Makefile doc/Makefile include/Makefile contrib/Makefile include/ulib/Makefile contrib/HCSP/Makefile contrib/RSIGN/Makefile contrib/signer/Makefile fuzz/Makefile src/ulib/Makefile src/ulib/ULib.rc src/ulib/ULib.pc src/ulib/orm/driver/Makefile src/ulib/net/server/plugin/Makefile src/ulib/net/server/plugin/v8/Makefile src/ulib/net/server/plugin/php/Makefile src/ulib/net/server/plugin/usp/Makefile src/ulib/net/server/plugin/ruby/Makefile src/ulib/net/server/plugin/mod_shib/Makefile src/ulib/net/server/plugin/mod_geoip/Makefile src/ulib/net/server/plugin/usp/usp_compile.sh src/ulib/net/server/plugin/page_speed/Makefile src/ulib/net/server/plugin/python/Makefile examples/Makefile examples/IR/Makefile examples/csp/Makefile examples/lcsp/Makefile examples/rsign/Makefile examples/hello/Makefile examples/WiAuth/Makefile examples/xml2txt/Makefile examples/uclient/Makefile examples/userver/Makefile examples/PEC_log/Makefile examples/workflow/Makefile examples/doc_parse/Makefile examples/lrp_session/Makefile examples/http_header/Makefile examples/test_manager/Makefile examples/doc_classifier/Makefile examples/form_completion/Makefile examples/simple_client_server/Makefile examples/download_accelerator/Makefile examples/XAdES/Makefile examples/XAdES/XAdES.spec examples/xml2txt/xml2txt.spec examples/IR/searchengine-bin.spec examples/lcsp/lcsp.spec examples/lcsp/lcsp_rpc.spec examples/csp/cspclient.spec examples/csp/cspclient_rpc.spec examples/rsign/rsignclient.spec examples/rsign/rsignclient_rpc.spec examples/userver/web_server.spec examples/userver/wagsmserver.spec examples/workflow/workflow.spec examples/PEC_log/PEC_log.spec examples/userver/tsaserver.spec examples/userver/cspserver.spec examples/userver/rsignserver.spec examples/doc_parse/doc_parse.spec tests/Makefile tests/base/Makefile tests/debug/Makefile tests/ulib/Makefile tests/ulib/http2/Makefile tests/examples/Makefile tests/contrib/Makefile"
+ac_config_files="$ac_config_files Makefile rpm.sh ULib.spec userver.service m4/Makefile doc/Makefile include/Makefile contrib/Makefile include/ulib/Makefile contrib/HCSP/Makefile contrib/RSIGN/Makefile contrib/signer/Makefile fuzz/Makefile src/ulib/Makefile src/ulib/ULib.rc src/ulib/ULib.pc src/ulib/orm/driver/Makefile src/ulib/net/server/plugin/Makefile src/ulib/net/server/plugin/v8/Makefile src/ulib/net/server/plugin/php/Makefile src/ulib/net/server/plugin/usp/Makefile src/ulib/net/server/plugin/ruby/Makefile src/ulib/net/server/plugin/mod_shib/Makefile src/ulib/net/server/plugin/mod_geoip/Makefile src/ulib/net/server/plugin/usp/usp_compile.sh src/ulib/net/server/plugin/page_speed/Makefile src/ulib/net/server/plugin/python/Makefile examples/Makefile examples/IR/Makefile examples/csp/Makefile examples/lcsp/Makefile examples/rsign/Makefile examples/hello/Makefile examples/WiAuth/Makefile examples/xml2txt/Makefile examples/uclient/Makefile examples/userver/Makefile examples/PEC_log/Makefile examples/workflow/Makefile examples/doc_parse/Makefile examples/lrp_session/Makefile examples/http_header/Makefile examples/test_manager/Makefile examples/doc_classifier/Makefile examples/form_completion/Makefile examples/simple_client_server/Makefile examples/download_accelerator/Makefile examples/XAdES/Makefile examples/XAdES/XAdES.spec examples/xml2txt/xml2txt.spec examples/IR/searchengine-bin.spec examples/lcsp/lcsp.spec examples/lcsp/lcsp_rpc.spec examples/csp/cspclient.spec examples/csp/cspclient_rpc.spec examples/rsign/rsignclient.spec examples/rsign/rsignclient_rpc.spec examples/userver/web_server.spec examples/userver/wagsmserver.spec examples/workflow/workflow.spec examples/PEC_log/PEC_log.spec examples/userver/tsaserver.spec examples/userver/cspserver.spec examples/userver/rsignserver.spec examples/doc_parse/doc_parse.spec tests/Makefile tests/base/Makefile tests/debug/Makefile tests/ulib/Makefile tests/ulib/http2/Makefile tests/examples/Makefile tests/contrib/Makefile"
 
 
 #	examples/parser/Makefile \
@@ -35200,6 +35207,7 @@ do
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "rpm.sh") CONFIG_FILES="$CONFIG_FILES rpm.sh" ;;
     "ULib.spec") CONFIG_FILES="$CONFIG_FILES ULib.spec" ;;
+    "userver.service") CONFIG_FILES="$CONFIG_FILES userver.service" ;;
     "m4/Makefile") CONFIG_FILES="$CONFIG_FILES m4/Makefile" ;;
     "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
     "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;

diff --git a/configure.ac b/configure.ac
@@ -2512,7 +2512,11 @@ if test -n "$posix4_lib"; then
    ULIB_LIBS="$ULIB_LIBS $posix4_lib";
 fi
 if test -n "$plib"; then
-   ULIB_LIBS="$ULIB_LIBS -Wl,--no-as-needed $plib";
+	if test "$with_gnu_ld" = "yes" -a "$enable_new_ldflags" = "yes"; then
+		ULIB_LIBS="$ULIB_LIBS -Wl,--no-as-needed $plib";
+	else
+		ULIB_LIBS="$ULIB_LIBS $plib";
+	fi
 fi
 if test "$enable_coverage" = "yes"; then
 	ULIB_LIBS="$ULIB_LIBS -lgcov"
@@ -2674,6 +2678,8 @@ AC_DEFINE_UNQUOTED(U_LIBEXECDIR, "$u_libexecdir", [install directory for plugins
 # Config dir - read-only single-machine data [PREFIX/etc]
 AC_DEFINE_UNQUOTED(U_SYSCONFDIR, "$u_sysconfdir", [install directory for configuration data])
 
+ULIB_PREFIXDIR="$u_prefixdir"
+AC_SUBST(ULIB_PREFIXDIR)
 ULIB_MODULEDIR="$u_libexecdir"
 AC_SUBST(ULIB_MODULEDIR)
 ULIB_SYSCONFDIR="$u_sysconfdir"
@@ -2745,7 +2751,7 @@ See include/ulib/internal/config.h for further configuration information
 # SECTION 16: `AC_CONFIG_FILES([FILE...])
 
 AC_CONFIG_FILES([
-	Makefile rpm.sh ULib.spec m4/Makefile doc/Makefile include/Makefile contrib/Makefile
+	Makefile rpm.sh ULib.spec userver.service m4/Makefile doc/Makefile include/Makefile contrib/Makefile
 	include/ulib/Makefile contrib/HCSP/Makefile contrib/RSIGN/Makefile contrib/signer/Makefile fuzz/Makefile
 	src/ulib/Makefile src/ulib/ULib.rc src/ulib/ULib.pc src/ulib/orm/driver/Makefile src/ulib/net/server/plugin/Makefile
 	src/ulib/net/server/plugin/v8/Makefile src/ulib/net/server/plugin/php/Makefile src/ulib/net/server/plugin/usp/Makefile

diff --git a/contrib/HCSP/Makefile.in b/contrib/HCSP/Makefile.in
@@ -335,6 +335,7 @@ ULIB = @ULIB@
 ULIBS = @ULIBS@
 ULIB_LIBS = @ULIB_LIBS@
 ULIB_MODULEDIR = @ULIB_MODULEDIR@
+ULIB_PREFIXDIR = @ULIB_PREFIXDIR@
 ULIB_SYSCONFDIR = @ULIB_SYSCONFDIR@
 ULIB_VERSION = @ULIB_VERSION@
 USP_FLAGS = @USP_FLAGS@

diff --git a/contrib/Makefile.in b/contrib/Makefile.in
@@ -318,6 +318,7 @@ ULIB = @ULIB@
 ULIBS = @ULIBS@
 ULIB_LIBS = @ULIB_LIBS@
 ULIB_MODULEDIR = @ULIB_MODULEDIR@
+ULIB_PREFIXDIR = @ULIB_PREFIXDIR@
 ULIB_SYSCONFDIR = @ULIB_SYSCONFDIR@
 ULIB_VERSION = @ULIB_VERSION@
 USP_FLAGS = @USP_FLAGS@

diff --git a/contrib/RSIGN/Makefile.in b/contrib/RSIGN/Makefile.in
@@ -307,6 +307,7 @@ ULIB = @ULIB@
 ULIBS = @ULIBS@
 ULIB_LIBS = @ULIB_LIBS@
 ULIB_MODULEDIR = @ULIB_MODULEDIR@
+ULIB_PREFIXDIR = @ULIB_PREFIXDIR@
 ULIB_SYSCONFDIR = @ULIB_SYSCONFDIR@
 ULIB_VERSION = @ULIB_VERSION@
 USP_FLAGS = @USP_FLAGS@

diff --git a/contrib/signer/Makefile.in b/contrib/signer/Makefile.in
@@ -306,6 +306,7 @@ ULIB = @ULIB@
 ULIBS = @ULIBS@
 ULIB_LIBS = @ULIB_LIBS@
 ULIB_MODULEDIR = @ULIB_MODULEDIR@
+ULIB_PREFIXDIR = @ULIB_PREFIXDIR@
 ULIB_SYSCONFDIR = @ULIB_SYSCONFDIR@
 ULIB_VERSION = @ULIB_VERSION@
 USP_FLAGS = @USP_FLAGS@

diff --git a/doc/Makefile.in b/doc/Makefile.in
@@ -256,6 +256,7 @@ ULIB = @ULIB@
 ULIBS = @ULIBS@
 ULIB_LIBS = @ULIB_LIBS@
 ULIB_MODULEDIR = @ULIB_MODULEDIR@
+ULIB_PREFIXDIR = @ULIB_PREFIXDIR@
 ULIB_SYSCONFDIR = @ULIB_SYSCONFDIR@
 ULIB_VERSION = @ULIB_VERSION@
 USP_FLAGS = @USP_FLAGS@

diff --git a/examples/IR/Makefile.in b/examples/IR/Makefile.in
@@ -403,6 +403,7 @@ ULIB = @ULIB@
 ULIBS = @ULIBS@
 ULIB_LIBS = @ULIB_LIBS@
 ULIB_MODULEDIR = @ULIB_MODULEDIR@
+ULIB_PREFIXDIR = @ULIB_PREFIXDIR@
 ULIB_SYSCONFDIR = @ULIB_SYSCONFDIR@
 ULIB_VERSION = @ULIB_VERSION@
 USP_FLAGS = @USP_FLAGS@

diff --git a/examples/IR/posting.cpp b/examples/IR/posting.cpp
@@ -104,8 +104,8 @@ UPosting::UPosting(uint32_t dimension, bool parsing, bool index)
 
       dimension += dimension / 4;
 
-      U_NEW(UHashMap<UString>, tbl_name,  UHashMap<UString>(u_nextPowerOfTwo64(dimension)));
-      U_NEW(UHashMap<UString>, tbl_words, UHashMap<UString>(u_nextPowerOfTwo64(approximate_num_words), ignore_case));
+      U_NEW(UHashMap<UString>, tbl_name,  UHashMap<UString>(u_nextPowerOfTwo(dimension)));
+      U_NEW(UHashMap<UString>, tbl_words, UHashMap<UString>(u_nextPowerOfTwo(approximate_num_words), ignore_case));
       }
 
    if (parsing)

diff --git a/examples/Makefile.in b/examples/Makefile.in
@@ -328,6 +328,7 @@ ULIB = @ULIB@
 ULIBS = @ULIBS@
 ULIB_LIBS = @ULIB_LIBS@
 ULIB_MODULEDIR = @ULIB_MODULEDIR@
+ULIB_PREFIXDIR = @ULIB_PREFIXDIR@
 ULIB_SYSCONFDIR = @ULIB_SYSCONFDIR@
 ULIB_VERSION = @ULIB_VERSION@
 USP_FLAGS = @USP_FLAGS@

diff --git a/examples/PEC_log/Makefile.in b/examples/PEC_log/Makefile.in
@@ -404,6 +404,7 @@ ULIB = @ULIB@
 ULIBS = @ULIBS@
 ULIB_LIBS = @ULIB_LIBS@
 ULIB_MODULEDIR = @ULIB_MODULEDIR@
+ULIB_PREFIXDIR = @ULIB_PREFIXDIR@
 ULIB_SYSCONFDIR = @ULIB_SYSCONFDIR@
 ULIB_VERSION = @ULIB_VERSION@
 USP_FLAGS = @USP_FLAGS@

diff --git a/examples/PEC_log/PEC_report_anomalie1.cpp b/examples/PEC_log/PEC_report_anomalie1.cpp
@@ -323,7 +323,7 @@ class Application : public PEC_report_anomalie {
 
       // setting for anomalie
 
-      table = new UHashMap<Messaggio*>(u_nextPowerOfTwo64(max_size_table + MARGINE), true); // ignore case
+      table = new UHashMap<Messaggio*>(u_nextPowerOfTwo(max_size_table + MARGINE), true); // ignore case
 
       rdbname               = new UString(100U);
       Messaggio::id_max_ttl = new UString;

diff --git a/examples/PEC_log/PEC_report_messaggi.cpp b/examples/PEC_log/PEC_report_messaggi.cpp
@@ -417,7 +417,7 @@ class Application : public PEC_report {
 
       // setting for messaggi
 
-      table = new UHashMap<VCasellaIdCounter*>(u_nextPowerOfTwo64(16 * 1024), true); // ignore case
+      table = new UHashMap<VCasellaIdCounter*>(u_nextPowerOfTwo(16 * 1024), true); // ignore case
 
       PEC_report::parse       = Application::parseLineForMessaggi;
       PEC_report::change_file = Application::reportNumCaselle;

diff --git a/examples/WiAuth/Makefile.in b/examples/WiAuth/Makefile.in
@@ -387,6 +387,7 @@ ULIB = @ULIB@
 ULIBS = @ULIBS@
 ULIB_LIBS = @ULIB_LIBS@
 ULIB_MODULEDIR = @ULIB_MODULEDIR@
+ULIB_PREFIXDIR = @ULIB_PREFIXDIR@
 ULIB_SYSCONFDIR = @ULIB_SYSCONFDIR@
 ULIB_VERSION = @ULIB_VERSION@
 USP_FLAGS = @USP_FLAGS@

diff --git a/examples/XAdES/Makefile.in b/examples/XAdES/Makefile.in
@@ -347,6 +347,7 @@ ULIB = @ULIB@
 ULIBS = @ULIBS@
 ULIB_LIBS = @ULIB_LIBS@
 ULIB_MODULEDIR = @ULIB_MODULEDIR@
+ULIB_PREFIXDIR = @ULIB_PREFIXDIR@
 ULIB_SYSCONFDIR = @ULIB_SYSCONFDIR@
 ULIB_VERSION = @ULIB_VERSION@
 USP_FLAGS = @USP_FLAGS@

diff --git a/examples/csp/Makefile.in b/examples/csp/Makefile.in
@@ -320,6 +320,7 @@ ULIB = @ULIB@
 ULIBS = @ULIBS@
 ULIB_LIBS = @ULIB_LIBS@
 ULIB_MODULEDIR = @ULIB_MODULEDIR@
+ULIB_PREFIXDIR = @ULIB_PREFIXDIR@
 ULIB_SYSCONFDIR = @ULIB_SYSCONFDIR@
 ULIB_VERSION = @ULIB_VERSION@
 USP_FLAGS = @USP_FLAGS@

diff --git a/examples/doc_classifier/Makefile.in b/examples/doc_classifier/Makefile.in
@@ -327,6 +327,7 @@ ULIB = @ULIB@
 ULIBS = @ULIBS@
 ULIB_LIBS = @ULIB_LIBS@
 ULIB_MODULEDIR = @ULIB_MODULEDIR@
+ULIB_PREFIXDIR = @ULIB_PREFIXDIR@
 ULIB_SYSCONFDIR = @ULIB_SYSCONFDIR@
 ULIB_VERSION = @ULIB_VERSION@
 USP_FLAGS = @USP_FLAGS@

diff --git a/examples/doc_parse/Makefile.in b/examples/doc_parse/Makefile.in
@@ -308,6 +308,7 @@ ULIB = @ULIB@
 ULIBS = @ULIBS@
 ULIB_LIBS = @ULIB_LIBS@
 ULIB_MODULEDIR = @ULIB_MODULEDIR@
+ULIB_PREFIXDIR = @ULIB_PREFIXDIR@
 ULIB_SYSCONFDIR = @ULIB_SYSCONFDIR@
 ULIB_VERSION = @ULIB_VERSION@
 USP_FLAGS = @USP_FLAGS@

diff --git a/examples/download_accelerator/Makefile.in b/examples/download_accelerator/Makefile.in
@@ -308,6 +308,7 @@ ULIB = @ULIB@
 ULIBS = @ULIBS@
 ULIB_LIBS = @ULIB_LIBS@
 ULIB_MODULEDIR = @ULIB_MODULEDIR@
+ULIB_PREFIXDIR = @ULIB_PREFIXDIR@
 ULIB_SYSCONFDIR = @ULIB_SYSCONFDIR@
 ULIB_VERSION = @ULIB_VERSION@
 USP_FLAGS = @USP_FLAGS@

diff --git a/examples/form_completion/Makefile.in b/examples/form_completion/Makefile.in
@@ -308,6 +308,7 @@ ULIB = @ULIB@
 ULIBS = @ULIBS@
 ULIB_LIBS = @ULIB_LIBS@
 ULIB_MODULEDIR = @ULIB_MODULEDIR@
+ULIB_PREFIXDIR = @ULIB_PREFIXDIR@
 ULIB_SYSCONFDIR = @ULIB_SYSCONFDIR@
 ULIB_VERSION = @ULIB_VERSION@
 USP_FLAGS = @USP_FLAGS@

diff --git a/examples/hello/Makefile.in b/examples/hello/Makefile.in
@@ -304,6 +304,7 @@ ULIB = @ULIB@
 ULIBS = @ULIBS@
 ULIB_LIBS = @ULIB_LIBS@
 ULIB_MODULEDIR = @ULIB_MODULEDIR@
+ULIB_PREFIXDIR = @ULIB_PREFIXDIR@
 ULIB_SYSCONFDIR = @ULIB_SYSCONFDIR@
 ULIB_VERSION = @ULIB_VERSION@
 USP_FLAGS = @USP_FLAGS@

diff --git a/examples/http_header/Makefile.in b/examples/http_header/Makefile.in
@@ -306,6 +306,7 @@ ULIB = @ULIB@
 ULIBS = @ULIBS@
 ULIB_LIBS = @ULIB_LIBS@
 ULIB_MODULEDIR = @ULIB_MODULEDIR@
+ULIB_PREFIXDIR = @ULIB_PREFIXDIR@
 ULIB_SYSCONFDIR = @ULIB_SYSCONFDIR@
 ULIB_VERSION = @ULIB_VERSION@
 USP_FLAGS = @USP_FLAGS@

diff --git a/examples/lcsp/Makefile.in b/examples/lcsp/Makefile.in
@@ -320,6 +320,7 @@ ULIB = @ULIB@
 ULIBS = @ULIBS@
 ULIB_LIBS = @ULIB_LIBS@
 ULIB_MODULEDIR = @ULIB_MODULEDIR@
+ULIB_PREFIXDIR = @ULIB_PREFIXDIR@
 ULIB_SYSCONFDIR = @ULIB_SYSCONFDIR@
 ULIB_VERSION = @ULIB_VERSION@
 USP_FLAGS = @USP_FLAGS@

diff --git a/examples/lrp_session/Makefile.in b/examples/lrp_session/Makefile.in
@@ -313,6 +313,7 @@ ULIB = @ULIB@
 ULIBS = @ULIBS@
 ULIB_LIBS = @ULIB_LIBS@
 ULIB_MODULEDIR = @ULIB_MODULEDIR@
+ULIB_PREFIXDIR = @ULIB_PREFIXDIR@
 ULIB_SYSCONFDIR = @ULIB_SYSCONFDIR@
 ULIB_VERSION = @ULIB_VERSION@
 USP_FLAGS = @USP_FLAGS@

diff --git a/examples/rsign/Makefile.in b/examples/rsign/Makefile.in
@@ -321,6 +321,7 @@ ULIB = @ULIB@
 ULIBS = @ULIBS@
 ULIB_LIBS = @ULIB_LIBS@
 ULIB_MODULEDIR = @ULIB_MODULEDIR@
+ULIB_PREFIXDIR = @ULIB_PREFIXDIR@
 ULIB_SYSCONFDIR = @ULIB_SYSCONFDIR@
 ULIB_VERSION = @ULIB_VERSION@
 USP_FLAGS = @USP_FLAGS@

diff --git a/examples/simple_client_server/Makefile.in b/examples/simple_client_server/Makefile.in
@@ -313,6 +313,7 @@ ULIB = @ULIB@
 ULIBS = @ULIBS@
 ULIB_LIBS = @ULIB_LIBS@
 ULIB_MODULEDIR = @ULIB_MODULEDIR@
+ULIB_PREFIXDIR = @ULIB_PREFIXDIR@
 ULIB_SYSCONFDIR = @ULIB_SYSCONFDIR@
 ULIB_VERSION = @ULIB_VERSION@
 USP_FLAGS = @USP_FLAGS@

diff --git a/examples/test_manager/Makefile.in b/examples/test_manager/Makefile.in
@@ -307,6 +307,7 @@ ULIB = @ULIB@
 ULIBS = @ULIBS@
 ULIB_LIBS = @ULIB_LIBS@
 ULIB_MODULEDIR = @ULIB_MODULEDIR@
+ULIB_PREFIXDIR = @ULIB_PREFIXDIR@
 ULIB_SYSCONFDIR = @ULIB_SYSCONFDIR@
 ULIB_VERSION = @ULIB_VERSION@
 USP_FLAGS = @USP_FLAGS@

diff --git a/examples/uclient/Makefile.in b/examples/uclient/Makefile.in
@@ -339,6 +339,7 @@ ULIB = @ULIB@
 ULIBS = @ULIBS@
 ULIB_LIBS = @ULIB_LIBS@
 ULIB_MODULEDIR = @ULIB_MODULEDIR@
+ULIB_PREFIXDIR = @ULIB_PREFIXDIR@
 ULIB_SYSCONFDIR = @ULIB_SYSCONFDIR@
 ULIB_VERSION = @ULIB_VERSION@
 USP_FLAGS = @USP_FLAGS@