X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=configure.ac;h=64844e1b8309cda0a1d33ea523c0c233fb0eee73;hb=acea380c8297962d08281764451837d6936c1a54;hp=569c39ace3406c411261eb4f31106e7aa6c9c7cc;hpb=cd8d4f7a65a3ef8641af1f8a40371bb574df01d4;p=xboard.git diff --git a/configure.ac b/configure.ac index 569c39a..64844e1 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -1;2205;0cdnl| configure.in +dnl| configure.in dnl| dnl| Copyright 1992-2001, 2002, 2003, 2004, 2005, 2006, 2007, dnl| 2008, 2009, 2010 Free Software Foundation, Inc. @@ -28,10 +28,11 @@ dnl| to regenerate configure. Then submit your changes to be folded into dnl| the standard version of xboard. dnl| define second argument as VERSION.PATCHLEVEL. e.g. 4.4.0j -AC_INIT([xboard],[master-20100221],[bug-xboard@gnu.org]) +AC_INIT([xboard],[master-20100806],[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]) AC_CONFIG_HEADERS([config.h]) @@ -60,7 +61,6 @@ AH_TEMPLATE([USE_XAW3D],[template]) AH_TEMPLATE([X_LOCALE],[template]) - if test -z "$CFLAGS" ; then dnl| Prevent the next macro from setting CFLAGS to -g CFLAGS=" " @@ -84,7 +84,7 @@ fi AC_CHECK_PROGS(RSH, remsh rsh, rsh) AC_CHECK_PROGS(MINFO, makeinfo, makeinfo_not_found) -if test "$MINFO" == makeinfo_not_found ; then +if test "$MINFO" = makeinfo_not_found ; then echo Please install \"makeinfo\" exit 1 fi @@ -125,7 +125,7 @@ fi AC_CHECK_HEADER(X11/Intrinsic.h,xt="yes",xt="no") -if test "$xt" == "no" ; then +if test "$xt" = "no" ; then echo Xt headers not found exit 1 fi @@ -149,20 +149,42 @@ AS_IF([test "x$with_xaw3d" != xno], AC_MSG_FAILURE( [--with-Xaw3d was given, but test for Xaw3d failed])], [-lXaw])]) -if test "$with_xaw3d" == "no" ; then +if test "$with_xaw3d" = "no" ; then XAW_LIBS="-lXaw" fi AC_SUBST(XAW_LIBS) dnl | end Xaw3d test -if test "$xaw_headers" == "no" ; then +if test "$xaw_headers" = "no" ; then echo Xaw headers not found exit 1 fi +dnl | test for readline +AC_ARG_WITH([readline], + [AS_HELP_STRING([--with-readline], + [support fancy command line editing @<:@default=yes@:>@]) + ], + [], + [with_readline=yes]) + +LIBREADLINE= +AS_IF([test "x$with_readline" != xno], + [AC_CHECK_LIB([readline], [main], + [AC_SUBST([LIBREADLINE], ["-lreadline "]) + AC_DEFINE([HAVE_LIBREADLINE], [1], + [Define if you have libreadline]) + ], + [if test "x$with_readline" != xyes; then + AC_MSG_FAILURE( + [--with-readline was given, but test for readline failed]) + fi + ], "")]) + + AC_CANONICAL_HOST dnl| The following info is mostly gathered from GNU Emacs 19.24. Basically, @@ -440,6 +462,7 @@ echo " infodir: $infodir (info files will go here)" echo " sysconfdir: $sysconfdir (xboard.conf will go here)" echo "" echo " Xaw3d: $with_xaw3d" +echo " readline: $with_readline" echo "" echo " xpm: $enable_xpm" echo " ptys: $enable_ptys"