diff options
| author | Stephen D. Huston <shuston@apache.org> | 2011-10-21 14:42:12 +0000 |
|---|---|---|
| committer | Stephen D. Huston <shuston@apache.org> | 2011-10-21 14:42:12 +0000 |
| commit | f83677056891e436bf5ba99e79240df2a44528cd (patch) | |
| tree | 625bfd644b948e89105630759cf6decb0435354d /extras/sasl | |
| parent | ebfd9ff053b04ab379acfc0fefedee5a31b6d8a5 (diff) | |
| download | qpid-python-QPID-2519.tar.gz | |
Merged out from trunkQPID-2519
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-2519@1187375 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'extras/sasl')
| -rwxr-xr-x | extras/sasl/bootstrap | 2 | ||||
| -rw-r--r-- | extras/sasl/configure.ac | 1 | ||||
| -rw-r--r-- | extras/sasl/python/Makefile.am | 3 | ||||
| -rw-r--r-- | extras/sasl/ruby/Makefile.am | 2 | ||||
| -rw-r--r-- | extras/sasl/src/Makefile.am | 1 |
5 files changed, 4 insertions, 5 deletions
diff --git a/extras/sasl/bootstrap b/extras/sasl/bootstrap index 32085c325d..906e5a71e4 100755 --- a/extras/sasl/bootstrap +++ b/extras/sasl/bootstrap @@ -22,7 +22,7 @@ aclocal -I m4 autoheader libtoolize --automake -automake +automake --add-missing autoconf if [ "$1" = "-build" -o "$1" = "--build" ] ; then diff --git a/extras/sasl/configure.ac b/extras/sasl/configure.ac index bc0fadbb31..206c2f497d 100644 --- a/extras/sasl/configure.ac +++ b/extras/sasl/configure.ac @@ -23,7 +23,6 @@ AC_CONFIG_HEADERS([config.h]) AC_PROG_CC_STDC AM_PROG_CC_C_O AC_PROG_CXX -AC_USE_SYSTEM_EXTENSIONS AC_LANG([C++]) # Check for optional use of help2man diff --git a/extras/sasl/python/Makefile.am b/extras/sasl/python/Makefile.am index 43eef70923..7c61f37cee 100644 --- a/extras/sasl/python/Makefile.am +++ b/extras/sasl/python/Makefile.am @@ -29,8 +29,7 @@ BUILT_SOURCES = $(generated_file_list) $(generated_file_list): python.i $(top_srcdir)/src/saslwrapper.i $(SWIG) -c++ -python -Wall -I/usr/include $(INCLUDES) -o saslwrapper.cpp $(srcdir)/python.i -pylibdir = $(PYTHON_LIB) -python_PYTHON = saslwrapper.py +pyexec_PYTHON = saslwrapper.py pyexec_LTLIBRARIES = _saslwrapper.la _saslwrapper_la_LDFLAGS = -avoid-version -module -shared diff --git a/extras/sasl/ruby/Makefile.am b/extras/sasl/ruby/Makefile.am index da64239323..85fde1085d 100644 --- a/extras/sasl/ruby/Makefile.am +++ b/extras/sasl/ruby/Makefile.am @@ -35,7 +35,7 @@ rubylibarch_LTLIBRARIES = saslwrapper.la saslwrapper_la_LDFLAGS = -avoid-version -module -shared ".$(RUBY_DLEXT)" saslwrapper_la_LIBADD = $(RUBY_LIBS) $(top_builddir)/src/libsaslwrapper.la -lsasl2 -saslwrapper_la_CXXFLAGS = $(INCLUDES) -I$(RUBY_INC) -I$(RUBY_INC_ARCH) +saslwrapper_la_CXXFLAGS = $(INCLUDES) -I$(RUBY_INC) -I$(RUBY_INC_ARCH) -fno-strict-aliasing nodist_saslwrapper_la_SOURCES = saslwrapper.cpp CLEANFILES = $(generated_file_list) diff --git a/extras/sasl/src/Makefile.am b/extras/sasl/src/Makefile.am index 25529a3607..c2aa8dd188 100644 --- a/extras/sasl/src/Makefile.am +++ b/extras/sasl/src/Makefile.am @@ -24,6 +24,7 @@ nobase_include_HEADERS = ../include/saslwrapper.h lib_LTLIBRARIES = libsaslwrapper.la libsaslwrapper_la_SOURCES = cyrus/saslwrapper.cpp +libsaslwrapper_la_CXXFLAGS = -fno-strict-aliasing # Library Version Information: # |