dnl| configure.in
dnl|
dnl| Copyright 1992-2001, 2002, 2003, 2004, 2005, 2006, 2007,
-dnl| 2008, 2009, 2010 Free Software Foundation, Inc.
+dnl| 2008, 2009, 2010, 2011 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-20100806],[bug-xboard@gnu.org])
+AC_INIT([xboard],[master-20110507],[bug-xboard@gnu.org])
dnl| need this to be able to compile some files in a subdir (filebrowser)
AM_INIT_AUTOMAKE([subdir-objects])
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AC_CONFIG_HEADERS([config.h])
AC_ISC_POSIX
AC_PROG_INSTALL
-AC_PROG_LEX
-if test "$LEX" != flex; then
- LEX="$SHELL $missing_dir/missing flex"
- AC_SUBST([LEX_OUTPUT_ROOT], [lex.yy])
- AC_SUBST([LEXLIB], [''])
-fi
-
+dnl| add gettext support
+AM_GNU_GETTEXT_VERSION(0.18.1)
+AM_GNU_GETTEXT([external])
AC_CHECK_PROGS(RSH, remsh rsh, rsh)
AC_CHECK_PROGS(MINFO, makeinfo, makeinfo_not_found)
AC_HEADER_SYS_WAIT
AC_HEADER_DIRENT
AC_TYPE_SIGNAL
-AC_CHECK_HEADERS(stropts.h sys/time.h string.h unistd.h sys/systeminfo.h malloc.h)
+AC_CHECK_HEADERS(stropts.h sys/time.h string.h unistd.h sys/systeminfo.h)
AC_CHECK_HEADERS(fcntl.h sys/fcntl.h, break)
AC_CHECK_HEADERS(sys/socket.h lan/socket.h, break)
AC_CHECK_HEADER(stddef.h, [], AC_DEFINE(X_WCHAR, 1))
exit 1
fi
-dnl | test if user wants ot use Xaw3d headers
+dnl | test if user wants ot use Xaw3d or Xaw
+
+dnl | add configure option for Xaw3d
AC_ARG_WITH([Xaw3d],
- [AS_HELP_STRING([--with-Xaw3d],
- [use Xaw3d instead of Xaw])],
- [with_xaw3d=yes],
- [with_xaw3d=no])
+ [AS_HELP_STRING([--with-Xaw3d],[use Xaw3d instead of Xaw])],
+ [],
+ [with_Xaw3d=no])
+dnl | check availability of Xaw3d
XAW_LIBS=
-AS_IF([test "x$with_xaw3d" != xno],
+AS_IF([test x"$with_Xaw3d" != x"no"],
[AC_CHECK_LIB([Xaw3d],
[XawTextReplace],
- [AC_SUBST([XAW_LIBS],
- ["-lXaw3d"])
+ [AC_SUBST([XAW_LIBS],["-lXaw3d"])
AC_DEFINE([USE_XAW3D], [1],
[Define if you want to use Xaw3d])],
- [AC_CHECK_HEADER(X11/Xaw/Dialog.h,xaw_headers="yes")
- AC_MSG_FAILURE(
- [--with-Xaw3d was given, but test for Xaw3d failed])],
+ [AC_MSG_ERROR([--with-Xaw3d was given, but test for Xaw3d failed. Make sure that you have Xaw3d installed, else you might want to try the configure option --without-Xaw3d])],
[-lXaw])])
-if test "$with_xaw3d" = "no" ; then
+dnl | no Xaw3d, check for Xaw
+if test x"$with_Xaw3d" = x"no" ; then
+ AC_CHECK_HEADER(X11/Xaw/Dialog.h,xaw_headers="yes", xaw_headers="no")
+ if test x"$xaw_headers" = x"no" ; then
+ AC_MSG_ERROR([Xaw headers not found. Please install the Xaw package and headers.])
+ fi
XAW_LIBS="-lXaw"
fi
AC_SUBST(XAW_LIBS)
-dnl | end Xaw3d test
-
-if test "$xaw_headers" = "no" ; then
- echo Xaw headers not found
- exit 1
-
-fi
+dnl | end Xaw/Xaw3d test
AC_CANONICAL_HOST
AC_SUBST(X_LIBS)
-AC_CONFIG_FILES([Makefile cmail])
+AC_CONFIG_FILES([Makefile cmail po/Makefile.in])
AC_CONFIG_COMMANDS([test-stamp-h],[test -z "$CONFIG_HEADERS" || date > stamp-h])
AC_CONFIG_COMMANDS([chmod-cmail],[chmod 755 cmail])
AC_OUTPUT
echo ""
echo " prefix: $prefix "
echo " datarootdir: $datarootdir "
-echo " datadir: $datadir (icons will go in \$datadir\icons\hicolor\...)"
+echo " datadir: $datadir (icons will go in \$datadir/icons/hicolor/...)"
+echo " (bitmaps will go in \$datadir/games/xboard/...)"
echo " infodir: $infodir (info files will go here)"
echo " sysconfdir: $sysconfdir (xboard.conf will go here)"
echo ""
-echo " Xaw3d: $with_xaw3d"
+echo " NLS support: $USE_NLS"
+echo ""
+echo " Xaw3d: $with_Xaw3d"
echo ""
echo " xpm: $enable_xpm"
echo " ptys: $enable_ptys"