You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by pi...@apache.org on 2007/12/06 10:45:55 UTC
svn commit: r601671 - in /webservices/axis2/trunk/c/util: configure.ac
src/Makefile.am src/dir_handler.c
Author: pini
Date: Thu Dec 6 01:45:54 2007
New Revision: 601671
URL: http://svn.apache.org/viewvc?rev=601671&view=rev
Log:
Added --with-archive option
Modified:
webservices/axis2/trunk/c/util/configure.ac
webservices/axis2/trunk/c/util/src/Makefile.am
webservices/axis2/trunk/c/util/src/dir_handler.c
Modified: webservices/axis2/trunk/c/util/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/configure.ac?rev=601671&r1=601670&r2=601671&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/configure.ac (original)
+++ webservices/axis2/trunk/c/util/configure.ac Thu Dec 6 01:45:54 2007
@@ -200,14 +200,48 @@
TESTDIR=""
)
+AC_MSG_CHECKING(whether to use archive)
+AC_ARG_WITH(archive,
+[ --with-archive[=PATH] Find the zlib header files in 'PATH'.
+ If you omit the '=PATH' part completely, the configure script will search
+ '/usr/include/' for zlib headers.],
+[ case "$withval" in
+ no)
+ AC_MSG_RESULT(no)
+ ZLIBBUILD=""
+ zliblibs=""
+ ;;
+ *)
+ AC_MSG_RESULT(yes)
+ zliblibs="$(top_builddir)/src/minizip/libaxis2_minizip.la"
+ CFLAGS="$CFLAGS -DAXIS2_ARCHIVE_ENABLED"
+ if test -d $withval; then
+ zlibinc="-I$withval"
+ elif test -d '/usr/include'; then
+ zlibinc="-I/usr/include"
+ else
+ AC_MSG_ERROR(could not find zlib stop)
+ fi
+ ZLIBBUILD="minizip"
+ ;;
+ esac ],
+ AC_MSG_RESULT(no)
+)
+
+
CFLAGS="$CFLAGS $GUTHTHILA_CFLAGS"
UTILINC=$axis2_utilinc
+ZLIBINC=$zlibinc
+ZLIBLIBS=$zliblibs
VERSION_NO="1:0:1"
AC_SUBST(VERSION_NO)
AC_SUBST(UTILINC)
+AC_SUBST(ZLIBINC)
+AC_SUBST(ZLIBLIBS)
+AC_SUBST(ZLIBBUILD)
AC_SUBST(GUTHTHILA_DIR)
AC_SUBST(GUTHTHILA_LIBS)
AC_SUBST(TESTDIR)
Modified: webservices/axis2/trunk/c/util/src/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/Makefile.am?rev=601671&r1=601670&r2=601671&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/Makefile.am (original)
+++ webservices/axis2/trunk/c/util/src/Makefile.am Thu Dec 6 01:45:54 2007
@@ -1,4 +1,4 @@
-SUBDIRS = platforms/unix minizip
+SUBDIRS = platforms/unix @ZLIBBUILD@
lib_LTLIBRARIES = libaxutil.la
libaxutil_la_SOURCES = hash.c \
allocator.c \
Modified: webservices/axis2/trunk/c/util/src/dir_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/dir_handler.c?rev=601671&r1=601670&r2=601671&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/dir_handler.c (original)
+++ webservices/axis2/trunk/c/util/src/dir_handler.c Thu Dec 6 01:45:54 2007
@@ -24,7 +24,10 @@
# define S_ISDIR(m) ((m & S_IFMT) == S_IFDIR)
#endif
+#ifdef AXIS2_ARCHIVE_ENABLED
#include <minizip/axis2_archive_extract.h>
+#endif
+
extern int AXIS2_ALPHASORT(
);
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org