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 --- samples/client/Makefile.am | 2 +- samples/configure.ac | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'samples') 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 \ -- cgit v1.1-32-gdbae