dnl| configure.in
dnl|
dnl| Copyright 1992-2001, 2002, 2003, 2004, 2005, 2006, 2007,
-dnl| 2008, 2009 Free Software Foundation, Inc.
+dnl| 2008, 2009, 2010 Free Software Foundation, Inc.
dnl|
dnl| GNU XBoard is free software: you can redistribute it and/or modify
dnl| it under the terms of the GNU General Public License as published by
dnl| the standard version of xboard.
dnl| define second argument as VERSION.PATCHLEVEL. e.g. 4.4.0j
-AC_INIT([xboard],[master-20091122],[bug-xboard@gnu.org])
-AM_INIT_AUTOMAKE
+AC_INIT([xboard],[master-20100221],[bug-xboard@gnu.org])
+
+dnl| need this to be able to compile some files in a subdir (filebrowser)
+AM_INIT_AUTOMAKE([subdir-objects])
AC_CONFIG_HEADERS([config.h])
CFLAGS=" "
fi
AC_PROG_CC
+
+dnl| need this to be able to compile files in a subdir
+AM_PROG_CC_C_O
+
AC_PROG_CPP
AC_ISC_POSIX
AC_PROG_INSTALL
AC_CHECK_LIB(seq, getpseudotty)
+
+dnl | check for X-libraries
AC_PATH_XTRA
if test -n "$no_x" ; then
echo $PACKAGE requires the X Window System header files and libraries!
dnl| add some libs for OS X
*-apple-* )
- X_LIBS="$X_LIBS -lXmu -lX11 -lXt "
;;
esac
AC_DEFINE(ATTENTION, 1)])
+dnl | save all information for X in X_LIBS, also add the libraries themself
+dnl | since AC_PATH_XTRA only adds the paths
+X_LIBS="$X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS -lXmu -lX11 -lXt "
+AC_SUBST(X_CFLAGS)
+AC_SUBST(X_LIBS)
+
+
AC_CONFIG_FILES([Makefile cmail])
AC_CONFIG_COMMANDS([test-stamp-h],[test -z "$CONFIG_HEADERS" || date > stamp-h])
AC_CONFIG_COMMANDS([chmod-cmail],[chmod 755 cmail])
echo " Configurations summary:"
echo ""
echo " prefix: $prefix"
+echo " datarootdir: $datarootdir"
+echo " infodir: $infodir"
+echo " sysconfdir: $sysconfdir"
echo ""
echo " Xaw3d: $with_xaw3d"
echo ""