Permalink
Browse files

rollback 640..643 commits of highpower

git-svn-id: https://svn.opensource.yandex.net/xscript/trunk@653 b01ef89b-65f2-463d-9415-e8412542ae63
  • Loading branch information...
1 parent 42bd009 commit 743cfc99fc25aa8df7b673de93b5b3077a710696 compwolf committed Dec 11, 2008
View
15 Makefile.am
@@ -1,13 +1,12 @@
-ACLOCAL_AMFLAGS = -I config
AUTOMAKE_OPTIONS = 1.9 foreign
-
-SUBDIRS = include libltdl library standard xscript daemon
+ACLOCAL_AMFLAGS = -I config
+SUBDIRS = include library standard xscript daemon
EXTRA_DIST = ChangeLog Doxyfile AUTHORS COPYING INSTALL NEWS README \
- autogen.sh config/ax_check_compiler_flags.m4 config/ax_check_cppunit.m4 \
- config/cppunit.m4 config/pkg.m4 config/settings.h.in config/settings.h \
- debian/rules debian/changelog debian/compat debian/xscript-daemon.files \
- debian/control debian/xscript-daemon.init debian/xscript-utility.files \
+ autogen.sh config/cppunit.m4 config/ax_check_cppunit.m4 \
+ config/settings.h.in config/settings.h debian/rules debian/changelog \
+ debian/compat debian/xscript-daemon.files debian/control \
+ debian/xscript-daemon.init debian/xscript-utility.files \
debian/xscript-standard.preinst debian/libxscript-dev.files \
debian/xscript-daemon.preinst debian/xscript-standard.files \
debian/libxscript.files examples/control-logrotate.xml \
@@ -36,7 +35,7 @@ if HAVE_FILE_BLOCK
SUBDIRS += file-block
endif
-if HAVE_CPPUNIT
+if HAVE_TESTS
SUBDIRS += tests
endif
View
78 config/ax_check_compiler_flags.m4
@@ -1,78 +0,0 @@
-# ===========================================================================
-# http://autoconf-archive.cryp.to/ax_check_compiler_flags.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-# AX_CHECK_COMPILER_FLAGS(FLAGS, [ACTION-SUCCESS], [ACTION-FAILURE])
-#
-# DESCRIPTION
-#
-# Check whether the given compiler FLAGS work with the current language's
-# compiler, or whether they give an error. (Warnings, however, are
-# ignored.)
-#
-# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
-# success/failure.
-#
-# LAST MODIFICATION
-#
-# 2008-04-12
-#
-# COPYLEFT
-#
-# Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
-# Copyright (c) 2008 Matteo Frigo
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation, either version 3 of the License, or (at your
-# option) any later version.
-#
-# 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. If not, see <http://www.gnu.org/licenses/>.
-#
-# As a special exception, the respective Autoconf Macro's copyright owner
-# gives unlimited permission to copy, distribute and modify the configure
-# scripts that are the output of Autoconf when processing the Macro. You
-# need not follow the terms of the GNU General Public License when using
-# or distributing such scripts, even though portions of the text of the
-# Macro appear in them. The GNU General Public License (GPL) does govern
-# all other use of the material that constitutes the Autoconf Macro.
-#
-# This special exception to the GPL applies to versions of the Autoconf
-# Macro released by the Autoconf Macro Archive. When you make and
-# distribute a modified version of the Autoconf Macro, you may extend this
-# special exception to the GPL to apply to your modified version as well.
-
-AC_DEFUN([AX_CHECK_COMPILER_FLAGS],
-[AC_PREREQ(2.59) dnl for _AC_LANG_PREFIX
-AC_MSG_CHECKING([whether _AC_LANG compiler accepts $1])
-dnl Some hackery here since AC_CACHE_VAL can't handle a non-literal varname:
-AS_LITERAL_IF([$1],
- [AC_CACHE_VAL(AS_TR_SH(ax_cv_[]_AC_LANG_ABBREV[]_flags_$1), [
- ax_save_FLAGS=$[]_AC_LANG_PREFIX[]FLAGS
- _AC_LANG_PREFIX[]FLAGS="$1"
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM()],
- AS_TR_SH(ax_cv_[]_AC_LANG_ABBREV[]_flags_$1)=yes,
- AS_TR_SH(ax_cv_[]_AC_LANG_ABBREV[]_flags_$1)=no)
- _AC_LANG_PREFIX[]FLAGS=$ax_save_FLAGS])],
- [ax_save_FLAGS=$[]_AC_LANG_PREFIX[]FLAGS
- _AC_LANG_PREFIX[]FLAGS="$1"
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM()],
- eval AS_TR_SH(ax_cv_[]_AC_LANG_ABBREV[]_flags_$1)=yes,
- eval AS_TR_SH(ax_cv_[]_AC_LANG_ABBREV[]_flags_$1)=no)
- _AC_LANG_PREFIX[]FLAGS=$ax_save_FLAGS])
-eval ax_check_compiler_flags=$AS_TR_SH(ax_cv_[]_AC_LANG_ABBREV[]_flags_$1)
-AC_MSG_RESULT($ax_check_compiler_flags)
-if test "x$ax_check_compiler_flags" = xyes; then
- m4_default([$2], :)
-else
- m4_default([$3], :)
-fi
-])dnl AX_CHECK_COMPILER_FLAGS
View
27 config/ax_check_cppunit.m4
@@ -2,9 +2,12 @@ AC_DEFUN([AX_CHECK_CPPUNIT],
[
AC_REQUIRE([AM_PATH_CPPUNIT])
+ AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
+
ac_have_cppunit="no"
ac_cppunit_found="no"
- AC_ARG_WITH(cppunit,
+ AC_ARG_ENABLE(cppunit,
AS_HELP_STRING(--enable-cppunit,enables cppunit tests compilation),
[
if test "f$enableval" = "fyes"; then
@@ -14,31 +17,25 @@ AC_DEFUN([AX_CHECK_CPPUNIT],
if test "f$ac_have_cppunit" = "fyes"; then
ac_cppunit_found="yes"
-
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
- AM_PATH_CPPUNIT([$1], [], [ac_cppunit_found="no"])
+ AM_PATH_CPPUNIT([1.10.0], [], [ac_cppunit_found="no"])
ac_stored_libs=$LIBS
ac_stored_cppflags=$CPPFLAGS
LIBS="$ac_stored_libs $CPPUNIT_LIBS"
CPPFLAGS="$ac_stored_cppflags $CPPUNIT_CFLAGS"
- AC_MSG_CHECKING([linkage with cppunit])
+ AC_MSG_CHECKING([trying to link with cppunit])
AC_LINK_IFELSE(
[AC_LANG_PROGRAM([#include <cppunit/ui/text/TestRunner.h>], [CppUnit::TextUi::TestRunner r;])],
[AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); ac_cppunit_found="no"])
CPPFLAGS=$ac_stored_cppflags
LIBS=$ac_stored_libs
-
- AC_LANG_RESTORE
- if test "f$ac_cppunit_found" = "fyes"; then
- ifelse([$2], , :, [$2])
- AC_DEFINE([HAVE_CPPUNIT], 1, [Define to 1 if you want to compile cppunit tests])
- else
- ifelse([$3], , :, [$3])
- fi
fi
- AM_CONDITIONAL(HAVE_CPPUNIT, [test "f$ac_cppunit_found" = "fyes"])
+ if test "f$ac_cppunit_found" != "fyes"; then
+ AC_MSG_RESULT([cppunit not found. compilation of tests disabled])
+ fi
+ AC_LANG_RESTORE
+ AM_CONDITIONAL(HAVE_TESTS, [test "f$ac_cppunit_found" = "fyes"])
])
+
View
114 config/pkg.m4
@@ -1,114 +0,0 @@
-# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
-#
-# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# 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; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-# ----------------------------------
-AC_DEFUN([PKG_PROG_PKG_CONFIG],
-[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
- AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-fi
-if test -n "$PKG_CONFIG"; then
- _pkg_min_version=m4_ifval([$1], [$1], [0.9.0])
- AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
- AC_MSG_RESULT([yes])
- else
- AC_MSG_RESULT([no])
- PKG_CONFIG=""
- fi
-
-fi[]dnl
-])# PKG_PROG_PKG_CONFIG
-
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-# ---------------------------------------------
-m4_define([_PKG_CONFIG],
-[if test "x$ac_cv_env_[]$1[]_set" = "xset"; then
- pkg_cv_[]$1=$ac_cv_env_[]$1[]_value
-elif test -n "$PKG_CONFIG"; then
- if AC_RUN_LOG([$PKG_CONFIG --exists "$3" >/dev/null 2>&1]); then
- pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-else
- pkg_failed=untried
-fi[]dnl
-])# _PKG_CONFIG
-
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-# [ACTION-IF-NOT-FOUND])
-#
-#
-# Note that if there is a possibility the first call to
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.in
-#
-#
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_MODULES],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-
-pkg_failed=no
-AC_CACHE_CHECK([for $1][_CFLAGS], [pkg_cv_][$1][_CFLAGS],
- [_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])])
-AC_CACHE_CHECK([for $1][_LIBS], [pkg_cv_][$1][_LIBS],
- [_PKG_CONFIG([$1][_LIBS], [libs], [$2])])
-
-if test $pkg_failed = yes; then
- $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
- # Put the nasty error message in config.log where it belongs
- echo "$$1[]_PKG_ERRORS" 1>&AS_MESSAGE_LOG_FD
-
- ifelse([$4], , [AC_MSG_ERROR(dnl
-[Package requirements ($2) were not met.
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively you may set the $1_CFLAGS and $1_LIBS environment variables
-to avoid the need to call pkg-config. See the pkg-config man page for
-more details.])],
- [$4])
-elif test $pkg_failed = untried; then
- ifelse([$4], , [AC_MSG_FAILURE(dnl
-[The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively you may set the $1_CFLAGS and $1_LIBS environment variables
-to avoid the need to call pkg-config. See the pkg-config man page for
-more details.
-
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
- [$4])
-else
- $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
- $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
- ifelse([$3], , :, [$3])
-fi[]dnl
-])# PKG_CHECK_MODULES
View
18 configure.in
@@ -3,11 +3,7 @@ AC_INIT([xscript],[5.42.0],[highpower@yandex-team.ru])
AM_INIT_AUTOMAKE
AC_GNU_SOURCE
-AC_CONFIG_SUBDIRS([libltdl])
-AC_CONFIG_HEADERS([config/settings.h])
-
-AC_LIBTOOL_DLOPEN
-AC_LIBLTDL_CONVENIENCE
+AC_CONFIG_HEADERS(config/settings.h)
AC_PROG_CXX
AC_PROG_CXXCPP
@@ -205,6 +201,7 @@ else
AC_MSG_RESULT([dmalloc not found. dmalloc check disabled])
fi
+AX_CHECK_CPPUNIT
AC_ARG_ENABLE(coverage,
AS_HELP_STRING(--enable-coverage,enables coverage tests compilation),
@@ -215,17 +212,6 @@ AC_ARG_ENABLE(coverage,
fi
])
-for i in -W -Wall -Wextra -fexceptions -frtti -ftemplate-depth-128; do
- AX_CHECK_COMPILER_FLAGS([$i], [CXXFLAGS="$CXXFLAGS $i"], [])
-done
-
-AX_CHECK_CPPUNIT([1.10.0], [], [
- AC_MSG_WARN([cppunit not found. compilation of tests disabled])
-])
-
-AC_SUBST(INCLTDL)
-AC_SUBST(LIBLTDL)
-
AC_CONFIG_FILES([Makefile
include/Makefile include/xscript/Makefile include/internal/Makefile
library/Makefile library/details/Makefile standard/Makefile
View
4 daemon/Makefile.am
@@ -9,6 +9,6 @@ noinst_HEADERS = server_request.h fcgi_server.h uptime_counter.h
dist_sysconf_DATA = xscript.conf.example xscript-ulimits.conf
-AM_CXXFLAGS = -pthread
-AM_CPPFLAGS = -I../include -I../config @yandex_platform_CFLAGS@
+AM_CPPFLAGS = -I@top_srcdir@/include -I@builddir@/config -D_REENTRANT @yandex_platform_CFLAGS@
+AM_CXXFLAGS = -W -Wall -fexceptions -frtti -ftemplate-depth-128 -finline -pthread
AM_LDFLAGS = -lboost_thread -lboost_filesystem @yandex_platform_LIBS@
View
2 debian/control
@@ -1,7 +1,7 @@
Source: xscript
Priority: optional
Maintainer: Oleg Obolenskiy <highpower@yandex-team.ru>
-Build-Depends: debhelper (>= 4.0.0), automake1.9, autotools-dev, libboost-dev, libboost-thread-dev, libboost-filesystem-dev, libcurl-dev, libfcgi-dev, libcppunit-dev, libxml2-dev, libxslt1-dev, libssl-dev, liblua5.1-0-dev, libltdl3-dev
+Build-Depends: debhelper (>= 4.0.0), automake1.9, autotools-dev, libboost-dev, libboost-thread-dev, libboost-filesystem-dev, libcurl-dev, libfcgi-dev, libcppunit-dev, libxml2-dev, libxslt1-dev, libssl-dev, liblua5.1-0-dev
Standards-Version: 3.6.1
Section: libs
View
14 debian/rules
@@ -3,12 +3,13 @@
#export DH_VERBOSE=1
CXX = g++
+CPPFLAGS = -D_GNU_SOURCE
+#CXXFLAGS = -I/usr/include/stlport
+LDFLAGS = -lm
+
ACLOCAL = /usr/bin/aclocal-1.9
AUTOMAKE = /usr/bin/automake-1.9
-LIBTOOLIZE = /usr/bin/libtoolize
-
ACLOCAL_OPTIONS = "-I config"
-LIBTOOLIZE_OPTIONS = --force --copy --ltdl
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CXXFLAGS += -g -O0
@@ -20,10 +21,7 @@ autogen: autogen-stamp
autogen-stamp:
dh_testdir
- rm -rf libltdl && $(LIBTOOLIZE) $(LIBTOOLIZE_OPTIONS)
- cd libltdl && AUTOMAKE=$(AUTOMAKE) ACLOCAL=$(ACLOCAL) ../autogen.sh && cd ..
- ACLOCAL_OPTIONS=$(ACLOCAL_OPTIONS) \
- AUTOMAKE=$(AUTOMAKE) ACLOCAL=$(ACLOCAL) ./autogen.sh
+ ACLOCAL_OPTIONS=$(ACLOCAL_OPTIONS) AUTOMAKE=$(AUTOMAKE) ACLOCAL=$(ACLOCAL) ./autogen.sh
touch autogen-stamp
configure: configure-stamp
@@ -32,7 +30,7 @@ configure-stamp:
dh_testdir
CXX="$(CXX)" CPPFLAGS="$(CPPFLAGS)" CXXFLAGS="$(CXXFLAGS) -g" LDFLAGS="$(LDFLAGS)" \
./configure --prefix=/usr --sysconfdir=/etc/xscript \
- --with-cppunit --enable-maintainer-mode
+ --enable-cppunit --enable-maintainer-mode
touch configure-stamp
build: build-stamp
View
4 file-block/Makefile.am
@@ -8,7 +8,7 @@ xscript_file_la_LDFLAGS = -lcurl -module -avoid-version -export-dynamic
noinst_HEADERS = file_block.h file_extension.h
-AM_CXXFLAGS = -pthread
-AM_CPPFLAGS = -I../include -I../config @yandex_platform_CFLAGS@
+AM_CPPFLAGS = -I@top_srcdir@/include -I@builddir@/config -D_REENTRANT @yandex_platform_CFLAGS@
+AM_CXXFLAGS = -W -Wall -fexceptions -frtti -ftemplate-depth-128 -finline -pthread
AM_LDFLAGS = -lboost_thread -lboost_filesystem @yandex_platform_LIBS@
View
4 http-block/Makefile.am
@@ -8,6 +8,6 @@ xscript_http_la_LDFLAGS = -lcurl -module -avoid-version -export-dynamic
noinst_HEADERS = http_helper.h http_block.h
-AM_CXXFLAGS = -pthread
-AM_CPPFLAGS = -I../include -I../config @yandex_platform_CFLAGS@
+AM_CPPFLAGS = -I@top_srcdir@/include -I@builddir@/config -D_REENTRANT @yandex_platform_CFLAGS@
+AM_CXXFLAGS = -W -Wall -fexceptions -frtti -ftemplate-depth-128 -finline -pthread
AM_LDFLAGS = -lboost_thread -lboost_filesystem @yandex_platform_LIBS@
View
7 library/Makefile.am
@@ -36,10 +36,9 @@ libxscript_la_SOURCES = args.cpp authorizer.cpp block.cpp component.cpp \
default_request_response.cpp \
validator_factory.cpp validator.cpp validator_exception.cpp
-libxscript_la_LDFLAGS = -lpthread @LTLIBICONV@ @LIBLTDL@ -lboost_thread -lboost_filesystem
+libxscript_la_LDFLAGS = -lpthread @LTLIBICONV@ -lboost_thread -lboost_filesystem
-AM_CXXFLAGS = -pthread
-AM_CPPFLAGS = -I../include -I../config @INCLTDL@ @yandex_platform_CFLAGS@
-AM_LDFLAGS = -lboost_thread -lboost_filesystem @yandex_platform_LIBS@
+AM_CXXFLAGS = -W -Wall -fexceptions -frtti -ftemplate-depth-128 -finline -pthread -I@top_srcdir@/include -I@builddir@ @yandex_platform_CFLAGS@
+AM_LDFLAGS = -lboost_thread -lboost_filesystem -I@top_srcdir@/include @yandex_platform_LIBS@
SUBDIRS = details
View
23 library/loader.cpp
@@ -9,7 +9,8 @@
#include <boost/thread/once.hpp>
#include <boost/current_function.hpp>
-#include "ltdl.h"
+#include <dlfcn.h>
+
#include "internal/loader.h"
#include "xscript/config.h"
#include "xscript/resource_holder.h"
@@ -23,13 +24,13 @@
namespace xscript {
template<>
-void ResourceHolderTraits<lt_dlhandle>::destroy(lt_dlhandle handle) {
+void ResourceHolderTraits<void*>::destroy(void* handle) {
if (NULL != handle) {
- lt_dlclose(handle);
+ dlclose(handle);
}
};
-typedef ResourceHolder<lt_dlhandle> Handle;
+typedef ResourceHolder<void*> Handle;
class LoaderImpl : public Loader {
public:
@@ -45,20 +46,16 @@ class LoaderImpl : public Loader {
void checkLoad(bool success) const;
private:
- std::vector<lt_dlhandle> handles_;
+ std::vector<void*> handles_;
static boost::shared_ptr<Loader> instance_;
};
boost::shared_ptr<Loader> LoaderImpl::instance_(new LoaderImpl());
Loader::Loader() {
- if (0 != lt_dlinit()) {
- throw std::runtime_error("failed to init libltdl");
- }
}
Loader::~Loader() {
- lt_dlexit();
}
boost::shared_ptr<Loader>
@@ -70,7 +67,7 @@ LoaderImpl::LoaderImpl() {
}
LoaderImpl::~LoaderImpl() {
- std::for_each(handles_.begin(), handles_.end(), boost::bind(&lt_dlclose, _1));
+ std::for_each(handles_.begin(), handles_.end(), boost::bind(&dlclose, _1));
}
boost::shared_ptr<Loader>
@@ -107,18 +104,18 @@ LoaderImpl::load(const char *name) {
typedef ExtensionInfo* (*ExtensionFunc)();
- Handle handle(lt_dlopen(name));
+ Handle handle(dlopen(name, RTLD_NOW | RTLD_GLOBAL));
checkLoad(NULL != handle.get());
handles_.push_back(handle.release());
- ExtensionFunc func = (ExtensionFunc) lt_dlsym(handles_.back(), "get_extension_info");
+ ExtensionFunc func = (ExtensionFunc) dlsym(handles_.back(), "get_extension_info");
return (NULL != func) ? func() : NULL;
}
void
LoaderImpl::checkLoad(bool success) const {
if (!success) {
- throw std::runtime_error(lt_dlerror());
+ throw std::runtime_error(dlerror());
}
}
View
6 lua-block/Makefile.am
@@ -13,16 +13,16 @@ noinst_HEADERS = cookie_methods.h exception.h lua_block.h method_map.h \
logger_methods.h \
xscript_methods.h
-AM_CXXFLAGS = -pthread
-AM_CPPFLAGS = -I../include -I../config @lua_CFLAGS@ @yandex_platform_CFLAGS@
+AM_CPPFLAGS = -I@top_srcdir@/include -I@builddir@/config -D_REENTRANT @lua_CFLAGS@ @yandex_platform_CFLAGS@
+AM_CXXFLAGS = -W -Wall -fexceptions -frtti -ftemplate-depth-128 -finline -pthread
AM_LDFLAGS = -lboost_thread -lboost_filesystem @yandex_platform_LIBS@
EXTRA_DIST = test.conf lua-badargcount.xml lua-badcode.xml lua-badtype.xml \
lua-cookie.xml lua-encode.xml lua-logger.xml lua-multi.xml lua-print.xml \
lua-request.xml lua-response-redirect.xml lua-response.xml \
lua-state-has.xml lua-state-is.xml lua-state.xml lua-md5.xml
-if HAVE_CPPUNIT
+if HAVE_TESTS
TESTS = test
check_PROGRAMS = test
View
5 mist-block/Makefile.am
@@ -3,12 +3,13 @@ pkglib_LTLIBRARIES = xscript-mist.la
xscript_mist_la_SOURCES = xml_node.cpp state_node.cpp state_param_node.cpp \
state_prefix_node.cpp mist_block.cpp
+
xscript_mist_la_LIBADD = ../library/libxscript.la
xscript_mist_la_LDFLAGS = -module -avoid-version -export-dynamic
noinst_HEADERS = mist_block.h state_node.h state_param_node.h \
state_prefix_node.h xml_node.h
-AM_CXXFLAGS = -pthread
-AM_CPPFLAGS = -I../include -I../config @yandex_platform_CFLAGS@
+AM_CPPFLAGS = -I@top_srcdir@/include -I@builddir@/config -D_REENTRANT @yandex_platform_CFLAGS@
+AM_CXXFLAGS = -W -Wall -fexceptions -frtti -ftemplate-depth-128 -finline -pthread
AM_LDFLAGS = -lboost_thread -lboost_filesystem @yandex_platform_LIBS@
View
7 standard/Makefile.am
@@ -39,6 +39,7 @@ xscript_development_la_SOURCES = development_mode.cpp
xscript_development_la_LIBADD = ../library/libxscript.la
xscript_development_la_LDFLAGS = -module
+
xscript_validators_la_SOURCES = range_validator.cpp
if HAVE_PCRE
@@ -48,13 +49,13 @@ endif
xscript_validators_la_LIBADD = ../library/libxscript.la
xscript_validators_la_LDFLAGS = -module
-AM_CXXFLAGS = -pthread
-AM_CPPFLAGS = -I../include -I../config @yandex_platform_CFLAGS@
+AM_CPPFLAGS = -I@top_srcdir@/include -I@builddir@/config -D_REENTRANT @yandex_platform_CFLAGS@
+AM_CXXFLAGS = -W -Wall -fexceptions -frtti -ftemplate-depth-128 -finline -pthread
AM_LDFLAGS = -lboost_thread -lboost_filesystem @yandex_platform_LIBS@
EXTRA_DIST = test.conf
-if HAVE_CPPUNIT
+if HAVE_TESTS
TESTS = test
check_PROGRAMS = test
View
6 tests/Makefile.am
@@ -1,4 +1,4 @@
-if HAVE_CPPUNIT
+if HAVE_TESTS
TESTS = test
check_PROGRAMS = test
@@ -17,8 +17,8 @@ test_LDFLAGS = @CPPUNIT_LIBS@ -export-dynamic
endif
-AM_CXXFLAGS = -pthread
-AM_CPPFLAGS = -I../include -I../config @yandex_platform_CFLAGS@
+AM_CPPFLAGS = -I@top_srcdir@/include -I@builddir@/config -D_REENTRANT @yandex_platform_CFLAGS@
+AM_CXXFLAGS = -W -Wall -fexceptions -frtti -ftemplate-depth-128 -finline -pthread
AM_LDFLAGS = -lboost_thread -lboost_filesystem @yandex_platform_LIBS@
EXTRA_DIST = test.conf badinclude.xml custom.xsl empty-cdata.xml \
View
4 xscript/Makefile.am
@@ -12,6 +12,6 @@ dist_xsl_DATA = profile.xsl
dist_sysconf_DATA = offline.conf
-AM_CXXFLAGS = -pthread
-AM_CPPFLAGS = -I../include -I../config @yandex_platform_CFLAGS@
+AM_CPPFLAGS = -I@top_srcdir@/include -I@builddir@/config -D_REENTRANT @yandex_platform_CFLAGS@
+AM_CXXFLAGS = -W -Wall -fexceptions -frtti -ftemplate-depth-128 -finline -pthread
AM_LDFLAGS = -lboost_thread -lboost_filesystem @yandex_platform_LIBS@

0 comments on commit 743cfc9

Please sign in to comment.