configure.ac   configure.ac 
# This file is an input file used by the GNU "autoconf" program to # This file is an input file used by the GNU "autoconf" program to
# generate the file "configure", which is run during XPA installation # generate the file "configure", which is run during XPA installation
# to configure the system for the local environment. # to configure the system for the local environment.
AC_INIT(xpa, 2.1.8, saord@cfa.harvard.edu, xpa) AC_INIT(xpa, 2.1.10, saord@cfa.harvard.edu, xpa)
AC_CONFIG_HEADERS([conf.h]) AC_CONFIG_HEADERS([conf.h])
AC_CONFIG_SRCDIR(./xpa.h) AC_CONFIG_SRCDIR(./xpa.h)
AC_CANONICAL_HOST AC_CANONICAL_HOST
# save LDFLAGS # save LDFLAGS
XLDFLAGS="$LDFLAGS" XLDFLAGS="$LDFLAGS"
# #
# checks that we use in most projects # checks that we use in most projects
skipping to change at line 35 skipping to change at line 35
AC_SUBST(SZ_LONG) AC_SUBST(SZ_LONG)
AC_PROG_RANLIB AC_PROG_RANLIB
AC_HEADER_STDC AC_HEADER_STDC
AC_CHECK_HEADERS(malloc.h) AC_CHECK_HEADERS(malloc.h)
AC_CHECK_HEADERS(getopt.h) AC_CHECK_HEADERS(getopt.h)
AC_CHECK_HEADERS(pwd.h) AC_CHECK_HEADERS(pwd.h)
AC_CHECK_HEADERS(values.h) AC_CHECK_HEADERS(values.h)
AC_CHECK_HEADERS(dlfcn.h) AC_CHECK_HEADERS(dlfcn.h)
AC_CHECK_HEADERS(setjmp.h)
AC_CHECK_HEADERS(sys/un.h) AC_CHECK_HEADERS(sys/un.h)
AC_CHECK_HEADERS(sys/shm.h) AC_CHECK_HEADERS(sys/shm.h)
AC_CHECK_HEADERS(sys/mman.h) AC_CHECK_HEADERS(sys/mman.h)
AC_CHECK_HEADERS(sys/ipc.h) AC_CHECK_HEADERS(sys/ipc.h)
AC_CHECK_TYPES([socklen_t], [], [], [#include <sys/socket.h>]) AC_CHECK_TYPES([socklen_t], [], [], [#include <sys/socket.h>])
AC_C_CONST AC_C_CONST
AC_CHECK_FUNCS(strchr memcpy snprintf atexit) AC_CHECK_FUNCS(strchr memcpy snprintf atexit setenv)
AC_CHECK_FUNC(connect) AC_CHECK_FUNC(connect)
if test $ac_cv_func_connect = no; then if test $ac_cv_func_connect = no; then
AC_CHECK_LIB(socket, connect, EXTRA_LIBS="$EXTRA_LIBS -lsocket") AC_CHECK_LIB(socket, connect, EXTRA_LIBS="$EXTRA_LIBS -lsocket")
fi fi
AC_CHECK_FUNC(gethostbyname) AC_CHECK_FUNC(gethostbyname)
if test $ac_cv_func_gethostbyname = no; then if test $ac_cv_func_gethostbyname = no; then
AC_CHECK_LIB(nsl, gethostbyname, EXTRA_LIBS="$EXTRA_LIBS -lnsl") AC_CHECK_LIB(nsl, gethostbyname, EXTRA_LIBS="$EXTRA_LIBS -lnsl")
fi fi
# AC_CHECK_LIB(db, snprintf, EXTRA_LIBS="$EXTRA_LIBS -ldb") # AC_CHECK_LIB(db, snprintf, EXTRA_LIBS="$EXTRA_LIBS -ldb")
# #
# checks specific to this project # checks specific to this project
# #
AC_MSG_CHECKING(for threaded xpans) AC_MSG_CHECKING(for threaded xpans)
AC_ARG_ENABLE(threaded-xpans, [ --enable-threaded-xpans build threaded xpans], AC_ARG_ENABLE(threaded-xpans, [ --enable-threaded-xpans build threaded xpans],
[fun_ok=$enableval], [fun_ok=no]) [fun_ok=$enableval], [fun_ok=no])
if test "$fun_ok" != "no"; then if test "$fun_ok" = "yes"; then
AC_MSG_RESULT($fun_ok) AC_MSG_RESULT($fun_ok)
AC_CHECK_LIB(pthread, pthread_create, have_pthread=yes) AC_CHECK_LIB(pthread, pthread_create, have_pthread=yes)
if test x"${have_pthread}" = x"yes"; then if test x"${have_pthread}" = x"yes"; then
AC_DEFINE(HAVE_LIBPTHREAD) AC_DEFINE(HAVE_LIBPTHREAD)
AC_DEFINE(_REENTRANT) AC_DEFINE(_REENTRANT)
TLIB="-lpthread" TLIB="-lpthread"
else else
AC_MSG_ERROR([no threads found ... can't use enable-threaded-xpans], 1) AC_MSG_ERROR([no threads found ... can't use enable-threaded-xpans], 1)
fi fi
else else
skipping to change at line 96 skipping to change at line 97
LLIB="-L. -l$PACKAGE_NAME" LLIB="-L. -l$PACKAGE_NAME"
else else
LLIB='$(LIB)' LLIB='$(LIB)'
fi fi
else else
LLIB='$(LIB)' LLIB='$(LIB)'
fi fi
AC_SUBST(LLIB) AC_SUBST(LLIB)
AC_MSG_RESULT($fun_ok) AC_MSG_RESULT($fun_ok)
AC_MSG_CHECKING(for request to use posix_spawn)
AC_ARG_ENABLE(posix_spawn, [ --enable-posix_spawn use posix_spawn() if
available],
[fun_ok=$enableval], [fun_ok=no])
AC_MSG_RESULT($fun_ok)
if test "$fun_ok" = "yes"; then
AC_CHECK_FUNCS(posix_spawn _NSGetEnviron)
AC_CHECK_HEADERS(crt_externs.h)
fi
AC_PATH_XTRA AC_PATH_XTRA
if test x"${have_x}" != "xno"; then if test x"${have_x}" = "xyes"; then
AC_DEFINE(HAVE_XT) AC_DEFINE(HAVE_XT)
fi fi
SC_PATH_TCLCONFIG SC_PATH_TCLCONFIG
if test x"${no_tcl}" = x ; then if test x"${no_tcl}" = x ; then
SC_LOAD_TCLCONFIG SC_LOAD_TCLCONFIG
if test -r $TCL_PREFIX/include/tcl.h; then if test -r $TCL_PREFIX/include/tcl.h; then
TCL_CFLAGS="$TCL_INCLUDE_SPEC" TCL_CFLAGS="$TCL_INCLUDE_SPEC"
TCL_LIBS="$TCL_LIB_SPEC" TCL_LIBS="$TCL_LIB_SPEC"
AC_DEFINE(HAVE_TCL) AC_DEFINE(HAVE_TCL)
skipping to change at line 137 skipping to change at line 147
CFLAGS="$CFLAGS -D_REENTRANT" CFLAGS="$CFLAGS -D_REENTRANT"
else else
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
fi fi
AC_MSG_CHECKING(for gtk) AC_MSG_CHECKING(for gtk)
AC_ARG_WITH(gtk, AC_ARG_WITH(gtk,
[ --with-gtk=<path> include directory for gtk e.g. /usr/include/ gtk-1.2], havelib=1, havelib=0) [ --with-gtk=<path> include directory for gtk e.g. /usr/include/ gtk-1.2], havelib=1, havelib=0)
if test x"$havelib" = x1 ; then if test x"$havelib" = x1 ; then
AC_MSG_RESULT(yes ($withval)) AC_MSG_RESULT(yes ($withval))
GTK_CFLAGS="`pkg-config gtk+ --cflags`" GTK_CFLAGS="`pkg-config gtk+-2.0 --cflags` -DHAVE_GTK=1"
GTK_LIBS="`pkg-config gtk+ --libs`" GTK_LIBS="`pkg-config gtk+-2.0 --libs`"
AC_DEFINE(HAVE_GTK) AC_DEFINE(HAVE_GTK)
else else
GTK_CFLAGS="" GTK_CFLAGS=""
GTK_LIBS="" GTK_LIBS=""
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
fi fi
AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS) AC_SUBST(GTK_LIBS)
# restore LDFLAGS # restore LDFLAGS
skipping to change at line 164 skipping to change at line 174
AC_DEFINE(HAVE_CYGWIN) AC_DEFINE(HAVE_CYGWIN)
AC_MSG_RESULT([flagging Cygwin]) AC_MSG_RESULT([flagging Cygwin])
;; ;;
*mingw32*|*Mingw32*) *mingw32*|*Mingw32*)
CFLAGS="$CFLAGS -mconsole" CFLAGS="$CFLAGS -mconsole"
EXTRA_LIBS="$EXTRA_LIBS -lwsock32" EXTRA_LIBS="$EXTRA_LIBS -lwsock32"
AC_DEFINE(HAVE_MINGW32) AC_DEFINE(HAVE_MINGW32)
AC_MSG_RESULT([flagging MinGW]) AC_MSG_RESULT([flagging MinGW])
;; ;;
*darwin*|*Darwin*) *darwin*|*Darwin*)
LDFLAGS="$LDFLAGS $CFLAGS"
CFLAGS="$CFLAGS -no-cpp-precomp" CFLAGS="$CFLAGS -no-cpp-precomp"
if test x"$TCL_PREFIX" = x"/usr/local"; then if test x"$TCL_PREFIX" = x"/usr/local"; then
TCL_CFLAGS="" TCL_CFLAGS=""
AC_MSG_RESULT([adding -no-cpp-precomp, removing -I/usr/local/inclu de]) AC_MSG_RESULT([adding -no-cpp-precomp, removing -I/usr/local/inclu de])
else else
AC_MSG_RESULT([adding -no-cpp-precomp to compiler]) AC_MSG_RESULT([adding -no-cpp-precomp to compiler])
fi fi
;; ;;
*osf*|*Osf*) *osf*|*Osf*)
AC_CHECK_LIB(db, snprintf, EXTRA_LIBS="$EXTRA_LIBS -ldb") AC_CHECK_LIB(db, snprintf, EXTRA_LIBS="$EXTRA_LIBS -ldb")
 End of changes. 8 change blocks. 
6 lines changed or deleted 18 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/