Index: configure.ac =================================================================== diff -u -reb758924a74f48512c98a40a539ab0c4e5a35de9 -r1e0bfe13a24da7bb97007fce4dcd6ebf681dcbd3 --- configure.ac (.../configure.ac) (revision eb758924a74f48512c98a40a539ab0c4e5a35de9) +++ configure.ac (.../configure.ac) (revision 1e0bfe13a24da7bb97007fce4dcd6ebf681dcbd3) @@ -11,16 +11,20 @@ # for this package, and can be a relative path, such as: # #-------------------------------------------------------------------- +AC_PREREQ([2.69]) + define(NsfVersion, 2.0b6) -AC_INIT([nsf], [NsfVersion]) +AC_INIT([nsf],[NsfVersion], [xotcl@alice.wu-wien.ac.at]) +AC_CONFIG_MACRO_DIR([m4]) +AC_CONFIG_AUX_DIR([tclconfig]) + #-------------------------------------------------------------------- # Call TEA_INIT as the first TEA_ macro to set up initial vars. # This will define a ${TEA_PLATFORM} variable == "unix" or "windows". #-------------------------------------------------------------------- TEA_INIT([3.9]) -AC_CONFIG_AUX_DIR(config) #-------------------------------------------------------------------- # specify some extra flags @@ -29,41 +33,45 @@ # - "with" is for external software (optional packages) # - "enable" is for optional features # -AC_ARG_WITH(aolserver3, - AC_HELP_STRING([--with-aolserver3=AOL_SERVER_DIR], +AC_ARG_WITH([aolserver3], + AS_HELP_STRING([--with-aolserver3=AOL_SERVER_DIR], [build an AOLserver 3 module; point to directory containing aolsever/include (default: off)]), [with_aol3=$withval], [with_aol3=no]) -AC_ARG_WITH(dtrace, - AC_HELP_STRING([--with-dtrace], [build nsf with dtrace (default: without)]), +AC_ARG_WITH([dtrace], + AS_HELP_STRING([--with-dtrace], [build nsf with dtrace (default: without)]), [with_dtrace=$withval], [with_dtrace=no]) -AC_ARG_WITH(mongodb, - AC_HELP_STRING([--with-mongodb=MONGO_INCLUDE_DIR[,MONGO_LIB_DIR]], - [build nsf with mongodb support (default: without)]), - [with_mongodb=$withval], [with_mongodb=no]) -AC_ARG_ENABLE(profile, - AC_HELP_STRING([--enable-profile], [build nsf with profile support (default: disabled)]), +AC_ARG_WITH([mongoc], + AS_HELP_STRING([--with-mongoc=MONGOC_INCLUDE_DIR[,MONGOC_LIB_DIR]], + [build nsf with mongodb c-driver support (default: without)]), + [with_mongoc=$withval], [with_mongoc=no]) +AC_ARG_WITH([bson], + AS_HELP_STRING([--with-bson=BSON_INCLUDE_DIR[,BSON_LIB_DIR]], + [build nsf with mongodb bson support (default: without)]), + [with_bson=$withval], [with_bson=no]) +AC_ARG_ENABLE([profile], + AS_HELP_STRING([--enable-profile], [build nsf with profile support (default: disabled)]), [enable_profile=$enableval], [enable_profile=no]) -AC_ARG_ENABLE(memcount, - AC_HELP_STRING([--enable-memcount=yes|trace], +AC_ARG_ENABLE([memcount], + AS_HELP_STRING([--enable-memcount=yes|trace], [build nsf with memcount debug support (default: disabled)]), [enable_memcount=$enableval], [enable_memcount=no]) -AC_ARG_ENABLE(development, - AC_HELP_STRING([--enable-development], +AC_ARG_ENABLE([development], + AS_HELP_STRING([--enable-development], [build nsf with development support (intensive runtime checking, etc.; default: disabled)]), [enable_development=$enableval], [enable_development=no]) -AC_ARG_ENABLE(assertions, - AC_HELP_STRING([--enable-assertions], +AC_ARG_ENABLE([assertions], + AS_HELP_STRING([--enable-assertions], [build nsf with assertion support (default: enabled)]), [enable_assertions=$enableval], [enable_assertions=yes]) -AC_ARG_ENABLE(assemble, - AC_HELP_STRING([--enable-assemble=yes|label|call], +AC_ARG_ENABLE([assemble], + AS_HELP_STRING([--enable-assemble=yes|label|call], [build nsf with assemble support (default: disabled)]), [enable_assemble=$enableval], [enable_assemble=no]) subdirs="" -if ! test "$with_mongodb" = no; then +if ! test "$with_mongoc" = no; then test_mongodb=test-mongdb subdirs="$subdirs library/mongodb" fi @@ -72,7 +80,7 @@ libdirs_actiweb="" apps_actiweb="" -AC_SUBST(subdirs) +AC_SUBST([subdirs]) #-------------------------------------------------------------------- @@ -91,10 +99,10 @@ NSF_VERSION=${NSF_MAJOR_VERSION}.${NSF_MINOR_VERSION} NODOT_VERSION=${NSF_MAJOR_VERSION}${NSF_MINOR_VERSION} -AC_SUBST(NSF_VERSION) -AC_SUBST(NSF_MAJOR_VERSION) -AC_SUBST(NSF_MINOR_VERSION) -AC_SUBST(NSF_PATCH_LEVEL) +AC_SUBST([NSF_VERSION]) +AC_SUBST([NSF_MAJOR_VERSION]) +AC_SUBST([NSF_MINOR_VERSION]) +AC_SUBST([NSF_PATCH_LEVEL]) echo "Configuring next Version $PACKAGE_VERSION" @@ -154,52 +162,52 @@ aol_prefix="${prefix}" fi fi -AC_SUBST(aol_prefix) +AC_SUBST([aol_prefix]) #-------------------------------------------------------------------- # check for tclCompile.h (needed, when compiled without full source) if test -f "$TCL_SRC_DIR/generic/tclCompile.h"; then - AC_DEFINE(HAVE_TCL_COMPILE_H, 1, [Do we have tclCompile.h installed?]) + AC_DEFINE([HAVE_TCL_COMPILE_H], [1], [Do we have tclCompile.h installed?]) fi if test "$enable_assertions" = yes; then - AC_DEFINE(NSF_WITH_ASSERTIONS, 1, [Are we building with assertions support?]) + AC_DEFINE([NSF_WITH_ASSERTIONS], [1], [Are we building with assertions support?]) fi if test "$enable_profile" = yes; then - AC_DEFINE(NSF_PROFILE, 1, [Are we building with profile support?]) + AC_DEFINE([NSF_PROFILE], [1], [Are we building with profile support?]) fi if test "$enable_development" = yes; then - AC_DEFINE(NSF_DEVELOPMENT, 1, [Are we building with development support?]) + AC_DEFINE([NSF_DEVELOPMENT], [1], [Are we building with development support?]) fi if test "$enable_memcount" = yes; then - AC_DEFINE(NSF_MEM_COUNT, 1, [Are we building with memcount support?]) + AC_DEFINE([NSF_MEM_COUNT], [1], [Are we building with memcount support?]) fi if test "$enable_memcount" = trace; then - AC_DEFINE(NSF_MEM_TRACE, 1, [Are we building with memcount tracing support?]) + AC_DEFINE([NSF_MEM_TRACE], [1], [Are we building with memcount tracing support?]) fi if test "$enable_assemble" = yes; then - AC_DEFINE(NSF_ASSEMBLE, 1, [Are we building with assembly support?]) + AC_DEFINE([NSF_ASSEMBLE], [1], [Are we building with assembly support?]) fi if test "$enable_assemble" = call; then - AC_DEFINE(NSF_ASSEMBLE_CT, 1, [Are we building with assembly call threading support?]) + AC_DEFINE([NSF_ASSEMBLE_CT], [1], [Are we building with assembly call threading support?]) fi if test "$enable_assemble" = call; then - AC_DEFINE(NSF_ASSEMBLE_LT, 1, [Are we building with assembly label threading support?]) + AC_DEFINE([NSF_ASSEMBLE_LT], [1], [Are we building with assembly label threading support?]) fi DTRACE_OBJ= if test "$with_dtrace" = yes; then - AC_DEFINE(NSF_DTRACE, 1, [Are we building with DTrace support?]) + AC_DEFINE([NSF_DTRACE], [1], [Are we building with DTrace support?]) # Under Mac OS X, we need no nsfDTrace.o if test "`uname -s`" != "Darwin" ; then DTRACE_OBJ=nsfDTrace.o fi fi -AC_SUBST(DTRACE_OBJ) +AC_SUBST([DTRACE_OBJ]) #----------------------------------------------------------------------- # __CHANGE__ @@ -212,8 +220,8 @@ #----------------------------------------------------------------------- TEA_ADD_SOURCES([nsf.c nsfError.c nsfObjectData.c nsfProfile.c \ - nsfDebug.c nsfUtil.c nsfObj.c nsfPointer.c \ - nsfShadow.c nsfCompile.c aolstub.c nsfStubInit.c]) + nsfDebug.c nsfUtil.c nsfObj.c nsfPointer.c nsfEnumerationType.c \ + nsfCmdDefinitions.c nsfShadow.c nsfCompile.c aolstub.c nsfStubInit.c]) TEA_ADD_HEADERS([generic/nsf.h generic/nsfInt.h generic/nsfDecls.h generic/nsfIntDecls.h]) TEA_ADD_INCLUDES([]) TEA_ADD_LIBS([]) @@ -236,7 +244,7 @@ if test "${TEA_PLATFORM}" = "windows" ; then if test "$GCC" != "yes" ; then - AC_DEFINE(VISUAL_CC) + AC_DEFINE([VISUAL_CC]) fi CLEANFILES="*.lib *.dll *.exp *.ilk *.pdb vc50.pch vc60.pch " #TEA_ADD_SOURCES([win/winFile.c]) @@ -321,7 +329,7 @@ # link against the non-stubbed Tcl library. #-------------------------------------------------------------------- -AC_DEFINE(USE_TCL_STUBS, 1, [Use Tcl stubs]) +AC_DEFINE([USE_TCL_STUBS], [1], [Use Tcl stubs]) #-------------------------------------------------------------------- # This macro generates a line to use when building a library. It @@ -343,7 +351,7 @@ # make this available, for such as nsfConfig.sh NSF_COMPATIBLE_TCLSH=${TCLSH_PROG} -AC_SUBST(NSF_COMPATIBLE_TCLSH) +AC_SUBST([NSF_COMPATIBLE_TCLSH]) # # Next Scripting specific configs @@ -366,7 +374,7 @@ NSF_STUB_LIB_PATH="${pkglibdir}/${PKG_STUB_LIB_FILE}" NSF_BUILD_STUB_LIB_SPEC="-L`pwd` -lnsfstub${PACKAGE_VERSION}" NSF_STUB_LIB_SPEC="-L${pkglibdir} -lnsfstub${PACKAGE_VERSION}" - AC_DEFINE(COMPILE_NSF_STUBS) + AC_DEFINE([COMPILE_NSF_STUBS]) fi else @@ -380,38 +388,38 @@ fi -AC_SUBST(SHARED_LIB_SUFFIX) -AC_SUBST(UNSHARED_LIB_SUFFIX) -AC_SUBST(NSF_BUILD_LIB_SPEC) -AC_SUBST(NSF_LIB_SPEC) -AC_SUBST(NSF_BUILD_STUB_LIB_SPEC) -AC_SUBST(NSF_STUB_LIB_SPEC) -AC_SUBST(NSF_BUILD_STUB_LIB_PATH) -AC_SUBST(NSF_STUB_LIB_PATH) +AC_SUBST([SHARED_LIB_SUFFIX]) +AC_SUBST([UNSHARED_LIB_SUFFIX]) +AC_SUBST([NSF_BUILD_LIB_SPEC]) +AC_SUBST([NSF_LIB_SPEC]) +AC_SUBST([NSF_BUILD_STUB_LIB_SPEC]) +AC_SUBST([NSF_STUB_LIB_SPEC]) +AC_SUBST([NSF_BUILD_STUB_LIB_PATH]) +AC_SUBST([NSF_STUB_LIB_PATH]) NSF_SRC_DIR=$srcdir -AC_SUBST(NSF_SRC_DIR) -AC_SUBST(NXSH) -AC_SUBST(XOWISH) +AC_SUBST([NSF_SRC_DIR]) +AC_SUBST([NXSH]) +AC_SUBST([XOWISH]) # include dirs for nsf during build process (i.e., does not assume installed) NSF_BUILD_INCLUDE_DIR="${NSF_SRC_DIR}/generic" NSF_BUILD_INCLUDE_SPEC="-I${NSF_BUILD_INCLUDE_DIR}" -AC_SUBST(NSF_BUILD_INCLUDE_DIR) -AC_SUBST(NSF_BUILD_INCLUDE_SPEC) +AC_SUBST([NSF_BUILD_INCLUDE_DIR]) +AC_SUBST([NSF_BUILD_INCLUDE_SPEC]) -AC_SUBST(test_actiweb) -AC_SUBST(libdirs_actiweb) -AC_SUBST(apps_actiweb) +AC_SUBST([test_actiweb]) +AC_SUBST([libdirs_actiweb]) +AC_SUBST([apps_actiweb]) -AC_SUBST(TEA_PLATFORM) +AC_SUBST([TEA_PLATFORM]) dnl macro expanding to the names of files ./configure is to generate. dnl reasoning: this is a factoring; I use this value elsewhere. dnl dnl Change the value of -this- macro if you want to add or remove dnl such files. -AC_DEFUN(CONFIG_OUTPUT_FILES, [[Makefile nsfConfig.sh library/xotcl/xotclsh library/xotcl/xowish unix/pkgIndex.unix nxsh nxwish]]) +AC_DEFUN([CONFIG_OUTPUT_FILES], [[Makefile nsfConfig.sh library/xotcl/xotclsh library/xotcl/xowish unix/pkgIndex.unix nxsh nxwish]]) #-------------------------------------------------------------------- # the value of this variable is set to the files which are to be @@ -421,7 +429,7 @@ #-------------------------------------------------------------------- CONFIG_CLEAN_FILES="CONFIG_OUTPUT_FILES autom4te.cache/" -AC_SUBST(CONFIG_CLEAN_FILES) +AC_SUBST([CONFIG_CLEAN_FILES]) AC_CONFIG_FILES(CONFIG_OUTPUT_FILES) #--------------------------------------------------------------------