From 5eb709e057b59487bcbd189c8ac918e6c1eff015 Mon Sep 17 00:00:00 2001
From: damitha
Date: Thu, 9 Jun 2011 16:11:45 +0000
Subject: Improving build for NTLM

git-svn-id: http://svn.apache.org/repos/asf/axis/axis2/c/core/trunk@1133957 13f79535-47bb-0310-9956-ffa450edef68
---
 configure.ac | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index fb3a271..23b1c5f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -211,25 +211,25 @@ AC_ARG_ENABLE(libxml2, [  --enable-libxml2
   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-libntlm
 [ 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, test x$libcurl_enabled = xtrue)
 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 \
-- 
cgit v1.1-32-gdbae