Improving build for NTLM

git-svn-id: http://svn.apache.org/repos/asf/axis/axis2/c/core/trunk@1133957 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 24 insertions, 21 deletions

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 \
diff --git a/samples/client/Makefile.am b/samples/client/Makefile.am
index 2eefd75..5256723 100644
--- a/samples/client/Makefile.am
+++ b/samples/client/Makefile.am
@@ -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
diff --git a/samples/configure.ac b/samples/configure.ac
index ee817f4..0df3b0d 100644
--- a/samples/configure.ac
+++ b/samples/configure.ac
@@ -101,13 +101,13 @@ AC_ARG_ENABLE(heimdal, [  --enable-heimdal
 [ 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-libntlm
 [ 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 \
diff --git a/src/core/transport/http/sender/Makefile.am b/src/core/transport/http/sender/Makefile.am
index b14fb4e..8a29493 100644
--- a/src/core/transport/http/sender/Makefile.am
+++ b/src/core/transport/http/sender/Makefile.am
@@ -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_builddir)/src/core/transport/http/common/
                                  $(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)