Index: kitsh/buildsrc/kitsh-0.0/aclocal.m4 ================================================================== --- kitsh/buildsrc/kitsh-0.0/aclocal.m4 +++ kitsh/buildsrc/kitsh-0.0/aclocal.m4 @@ -1,21 +1,5 @@ -AC_DEFUN(DC_DO_NETWORK, [ - AC_SEARCH_LIBS(inet_aton, xnet ws2_32 wsock32, [ - AC_DEFINE(HAVE_INET_ATON, [], [Have inet_aton()]) - ], [ - AC_SEARCH_LIBS(inet_addr, nsl ws2_32 wsock32, [ - AC_DEFINE(HAVE_INET_ADDR, [], [Have inet_addr()]) - ], [ - AC_MSG_WARN([could not find inet_addr or inet_aton!]) - ]) - ]) - - AC_SEARCH_LIBS(inet_ntoa, socket nsl ws2_32 wsock32,, [ AC_MSG_WARN([Couldn't find inet_ntoa!]) ]) - AC_SEARCH_LIBS(connect, socket nsl ws2_32 wsock32,, [ AC_MSG_WARN([Couldn't find connect!]) ]) - AC_SEARCH_LIBS(socket, socket nsl ws2_32 wsock32,, [ AC_MSG_WARN([Couldn't find socket!]) ]) -]) - AC_DEFUN(DC_DO_TCL, [ AC_MSG_CHECKING([path to tcl]) AC_ARG_WITH(tcl, AC_HELP_STRING([--with-tcl], [directory containing tcl configuration (tclConfig.sh)]), [], [ with_tcl="auto" ]) @@ -43,14 +27,16 @@ source "${tclconfigsh}" CFLAGS="${CFLAGS} ${TCL_INCLUDE_SPEC} -I${TCL_SRC_DIR}/generic" CPPFLAGS="${CPPFLAGS} ${TCL_INCLUDE_SPEC} -I${TCL_SRC_DIR}/generic" LDFLAGS="${LDFLAGS}" + LIBS="${LIBS} ${TCL_LIBS}" AC_SUBST(CFLAGS) AC_SUBST(CPPFLAGS) AC_SUBST(LDFLAGS) + AC_SUBST(LIBS) AC_MSG_RESULT([$tclconfigsh]) ]) AC_DEFUN(DC_DO_STATIC_LINK_LIBCXX, [ Index: kitsh/buildsrc/kitsh-0.0/configure.ac ================================================================== --- kitsh/buildsrc/kitsh-0.0/configure.ac +++ kitsh/buildsrc/kitsh-0.0/configure.ac @@ -7,13 +7,10 @@ AC_PROG_MAKE_SET AC_PROG_INSTALL AC_AIX AC_GNU_SOURCE -dnl Check for network libraries -DC_DO_NETWORK - dnl Find the appropriate Tcl headers and libraries DC_DO_TCL dnl Find out how to statically link to libstdc++ (for Metakit) DC_DO_STATIC_LINK_LIBCXX