You are viewing a plain text version of this content. The canonical link for it is here.
Posted to c-commits@axis.apache.org by da...@apache.org on 2011/06/09 18:11:46 UTC
svn commit: r1133957 - in /axis/axis2/c/core/trunk: configure.ac
samples/client/Makefile.am samples/configure.ac
src/core/transport/http/sender/Makefile.am
Author: damitha
Date: Thu Jun 9 16:11:45 2011
New Revision: 1133957
URL: http://svn.apache.org/viewvc?rev=1133957&view=rev
Log:
Improving build for NTLM
Modified:
axis/axis2/c/core/trunk/configure.ac
axis/axis2/c/core/trunk/samples/client/Makefile.am
axis/axis2/c/core/trunk/samples/configure.ac
axis/axis2/c/core/trunk/src/core/transport/http/sender/Makefile.am
Modified: axis/axis2/c/core/trunk/configure.ac
URL: http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/configure.ac?rev=1133957&r1=1133956&r2=1133957&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/configure.ac (original)
+++ axis/axis2/c/core/trunk/configure.ac Thu Jun 9 16:11:45 2011
@@ -211,25 +211,25 @@ AC_ARG_ENABLE(libxml2, [ --enable-libxm
AC_MSG_RESULT(no)
)
-NTLM_WRAPPER_DIR="default"
-
AC_MSG_CHECKING(whether to build heimdal ntlm wrapper library)
AC_ARG_ENABLE(heimdal, [ --enable-heimdal
build heimdal ntlm library wrapper (default=no)],
[ case "${enableval}" in
no)
AC_MSG_RESULT(no)
- NTLM_WRAPPER_DIR="default"
- NTLM_SAMPLE_DIR=""
+ NTLM_WRAPPER_DIR=""
+ NTLM_DIR=""
+ NTLM_LIB=""
;;
*)
AC_MSG_RESULT(yes)
NTLM_WRAPPER_DIR="heimdal"
- NTLM_SAMPLE_DIR="ntlm"
+ NTLM_DIR="ntlm"
#PKG_CHECK_MODULES(HEIMDAL, heimdal-1.4)
CFLAGS="$CFLAGS -DAXIS2_HEIMDAL_ENABLED -DAXIS2_NTLM_ENABLED"
CPPFLAGS="$CPPFLAGS $NTLM_CFLAGS -DAXIS2_HEIMDAL_ENABLED -DAXIS2_NTLM_ENABLED"
LDFLAGS="$LDFLAGS $NTLM_LDFLAGS"
+ NTLM_LIB="./ntlm/heimdal/libaxis2_ntlm.la"
;;
esac ],
AC_MSG_RESULT(no)
@@ -241,16 +241,18 @@ AC_ARG_ENABLE(libntlm, [ --enable-libnt
[ case "${enableval}" in
no)
AC_MSG_RESULT(no)
- NTLM_WRAPPER_DIR="default"
- NTLM_SAMPLE_DIR=""
+ NTLM_WRAPPER_DIR=""
+ NTLM_DIR=""
+ NTLM_LIB=""
;;
*)
AC_MSG_RESULT(yes)
NTLM_WRAPPER_DIR="libntlm"
- NTLM_SAMPLE_DIR="ntlm"
+ NTLM_DIR="ntlm"
CFLAGS="$CFLAGS -DAXIS2_LIBNTLM_ENABLED -DAXIS2_NTLM_ENABLED"
CPPFLAGS="$CPPFLAGS $NTLM_CFLAGS -DAXIS2_LIBNTLM_ENABLED -DAXIS2_NTLM_ENABLED"
LDFLAGS="$LDFLAGS $NTLM_LDFLAGS"
+ NTLM_LIB="./ntlm/libntlm/libaxis2_ntlm.la"
;;
esac ],
AC_MSG_RESULT(no)
@@ -516,7 +518,8 @@ AC_SUBST(NTLM_CFLAGS)
AC_SUBST(NTLM_LDFLAGS)
AC_SUBST(WRAPPER_DIR)
AC_SUBST(NTLM_WRAPPER_DIR)
-AC_SUBST(NTLM_SAMPLE_DIR)
+AC_SUBST(NTLM_LIB)
+AC_SUBST(NTLM_DIR)
AC_SUBST(TCP_DIR)
AC_SUBST(CGI_DIR)
AC_SUBST(AMQP_DIR)
@@ -530,7 +533,8 @@ AM_CONDITIONAL(AXIS2_LIBCURL_ENABLED, te
export NTLM_LDFLAGS
export WRAPPER_DIR
export NTLM_WRAPPER_DIR
-export NTLM_SAMPLE_DIR
+export NTLM_LIB
+export NTLM_DIR
export prefix
AC_CONFIG_FILES([Makefile \
Modified: axis/axis2/c/core/trunk/samples/client/Makefile.am
URL: http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/samples/client/Makefile.am?rev=1133957&r1=1133956&r2=1133957&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/samples/client/Makefile.am (original)
+++ axis/axis2/c/core/trunk/samples/client/Makefile.am Thu Jun 9 16:11:45 2011
@@ -12,5 +12,5 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-SUBDIRS = echo math google notify mtom yahoo amqp version mtom_callback session $(NTLM_SAMPLE_DIR)
+SUBDIRS = echo math google notify mtom yahoo amqp version mtom_callback session $(NTLM_DIR)
EXTRA_DIST= Makefile.am
Modified: axis/axis2/c/core/trunk/samples/configure.ac
URL: http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/samples/configure.ac?rev=1133957&r1=1133956&r2=1133957&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/samples/configure.ac (original)
+++ axis/axis2/c/core/trunk/samples/configure.ac Thu Jun 9 16:11:45 2011
@@ -101,13 +101,13 @@ AC_ARG_ENABLE(heimdal, [ --enable-heimd
[ case "${enableval}" in
no)
AC_MSG_RESULT(no)
- NTLM_WRAPPER_DIR="default"
- NTLM_SAMPLE_DIR=""
+ NTLM_WRAPPER_DIR=""
+ NTLM_DIR=""
;;
*)
AC_MSG_RESULT(yes)
NTLM_WRAPPER_DIR="heimdal"
- NTLM_SAMPLE_DIR="ntlm"
+ NTLM_DIR="ntlm"
#PKG_CHECK_MODULES(HEIMDAL, heimdal-1.4)
CFLAGS="$CFLAGS -DAXIS2_HEIMDAL_ENABLED -DAXIS2_NTLM_ENABLED"
CPPFLAGS="$CPPFLAGS $NTLM_CFLAGS -DAXIS2_HEIMDAL_ENABLED -DAXIS2_NTLM_ENABLED"
@@ -123,13 +123,13 @@ AC_ARG_ENABLE(libntlm, [ --enable-libnt
[ case "${enableval}" in
no)
AC_MSG_RESULT(no)
- NTLM_WRAPPER_DIR="default"
- NTLM_SAMPLE_DIR=""
+ NTLM_WRAPPER_DIR=""
+ NTLM_DIR=""
;;
*)
AC_MSG_RESULT(yes)
NTLM_WRAPPER_DIR="libntlm"
- NTLM_SAMPLE_DIR="ntlm"
+ NTLM_DIR="ntlm"
CFLAGS="$CFLAGS -DAXIS2_LIBNTLM_ENABLED -DAXIS2_NTLM_ENABLED"
CPPFLAGS="$CPPFLAGS $NTLM_CFLAGS -DAXIS2_LIBNTLM_ENABLED -DAXIS2_NTLM_ENABLED"
LDFLAGS="$LDFLAGS $NTLM_LDFLAGS"
@@ -176,7 +176,7 @@ AC_SUBST(APRINC)
AC_SUBST(AXIS2INC)
AC_SUBST(GUTHTHILA_DIR)
AC_SUBST(GUTHTHILA_LIBS)
-AC_SUBST(NTLM_SAMPLE_DIR)
+AC_SUBST(NTLM_DIR)
AC_SUBST(DICLIENT_DIR)
AC_CONFIG_FILES([Makefile \
Modified: axis/axis2/c/core/trunk/src/core/transport/http/sender/Makefile.am
URL: http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/src/core/transport/http/sender/Makefile.am?rev=1133957&r1=1133956&r2=1133957&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/src/core/transport/http/sender/Makefile.am (original)
+++ axis/axis2/c/core/trunk/src/core/transport/http/sender/Makefile.am Thu Jun 9 16:11:45 2011
@@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-SUBDIRS=ssl libcurl ntlm
+SUBDIRS=ssl libcurl $(NTLM_DIR)
lib_LTLIBRARIES = libaxis2_http_sender.la
@@ -48,7 +48,7 @@ libaxis2_http_sender_la_LIBADD = $(top_b
$(top_builddir)/src/core/transport/http/util/libaxis2_http_util.la\
$(top_builddir)/axiom/src/om/libaxis2_axiom.la\
$(top_builddir)/util/src/libaxutil.la\
- $(top_builddir)/src/core/transport/http/sender/ntlm/${NTLM_WRAPPER_DIR}/libaxis2_ntlm.la \
+ ${NTLM_LIB}\
$(LIBCURL_LIBS)\
$(SSL_LIBS)
@@ -66,5 +66,4 @@ INCLUDES = -I$(top_builddir)/include \
-I$(top_builddir)/src/core/deployment \
-I$(top_builddir)/util/include \
-I$(top_builddir)/axiom/include \
- -I$(top_builddir)/ntlm/include \
$(SSL_INC)