dnl| configure.in
dnl|
dnl| Copyright 1992-2001, 2002, 2003, 2004, 2005, 2006, 2007,
-dnl| 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
+dnl| 2008, 2009, 2010, 2011, 2012, 2013, 2014 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-20130828],[bug-xboard@gnu.org])
+AC_INIT([xboard],[master-20140119],[bug-xboard@gnu.org])
dnl| need this to be able to compile some files in a subdir (filebrowser)
AM_INIT_AUTOMAKE([subdir-objects])
AH_TEMPLATE([X_WCHAR],[template])
AH_TEMPLATE([ATTENTION],[template])
AH_TEMPLATE([DEFINED_SYS_ERRLIST],[template])
-AH_TEMPLATE([HAVE_LIBXPM],[template])
AH_TEMPLATE([USE_XAW3D],[template])
AH_TEMPLATE([X_LOCALE],[template])
AM_CONDITIONAL([withGTK], [test x"$with_GTK" = x"yes"])
AM_CONDITIONAL([withXaw], [test x"$with_Xaw3d" = x"yes" || test x"$with_Xaw" = x"yes"])
-
-AC_SUBST(FRONTEND_CFLAGS)
-AC_SUBST(FRONTEND_LIBS)
-
dnl | end Front-end check
AC_CANONICAL_HOST
dnl| add some libs for OS X
*-apple-* )
+ AC_MSG_WARN([Apple support is experimental, please report any problems to bug-xboard@gnu.org])
+ AC_PATH_PROG(SW_VERS, sw_vers)
+ if test "x$SW_VERS" != "x"; then
+ AC_MSG_CHECKING(Mac OS X version)
+ MACOSX_VERSION=`$SW_VERS -productVersion`
+ AC_MSG_RESULT([$MACOSX_VERSION])
+ fi
+ case "$MACOSX_VERSION" in
+ 10.0*|10.1|10.1.*|10.2*|10.3*|10.4*|10.5*|10.6*)
+ FRONTEND_LIBS= "$FRONTEND_LIBS -lgtkmacintegration -headerpad_max_install_names mmacosx-version-min=10.6 -isysroot /Developer/SDKs/MacOSX10.6.sdk"
+ ;;
+ *)
+ FRONTEND_LIBS = "$FRONTEND_LIBS -lgtkmacintegration -headerpad_max_install_names"
+ ;;
+ esac
+
;;
esac
-AC_ARG_ENABLE( [xpm],
- [AS_HELP_STRING([--enable-xpm],[libXpm will be used if found (default)])],
- [enable_xpm="$enableval"],
- [enable_xpm="yes"])
-
-if test x"$enable_xpm" != "xno"; then
- save_cflags="$CFLAGS"
- save_cppflags="$CPPFLAGS"
- CFLAGS="$CFLAGS $X_CFLAGS"
- CPPFLAGS="$CPPFLAGS $X_CFLAGS"
- AC_CHECK_HEADERS(X11/xpm.h)
- CFLAGS="$save_cflags"
- CPPFLAGS="$save_cppflags"
- if test "$ac_cv_header_X11_xpm_h" = "yes"; then
- save_ldflags="$LDFLAGS"
- LDFLAGS="$LDFLAGS $X_LIBS"
- AC_CHECK_LIB(Xpm, XpmReadFileToPixmap,
- [X_PRE_LIBS="-lXpm $X_PRE_LIBS"; AC_DEFINE(HAVE_LIBXPM)], [],
- [$X_PRE_LIBS -lX11 $X_EXTRA_LIBS])
- LDFLAGS="$save_ldflags"
- fi
-fi
+AC_SUBST(FRONTEND_CFLAGS)
+AC_SUBST(FRONTEND_LIBS)
AC_SUBST(PRE_XMULIB)
AC_SUBST(POST_XMULIB)
AC_SUBST(CONF_CFLAGS)
AC_SUBST(XDG_ICON_RESOURCE)
fi
+dnl create a string with configure options that can be passed to the
+dnl program, good for bug reports and version printout, see output below
+CONFIGURE_OPTIONS="prefix=$prefix; datarootdir=$datarootdir; \
+datadir=$datadir; gamedatadir=$GAMEDATADIR; desktopdir=$DESKTOPDIR; \
+mimedir=$MIMEDIR; iconsdir=$ICONSDIR; svgiconsdir=$SVGICONSDIR; infodir=$infodir; \
+sysconfigdir=$sysconfigdir; update_mimedb=$enable_mimedb; NLS=$USE_NLS; \
+GKT=$with_GTK; Xaw3d=$with_Xaw3d; Xaw=$with_Xaw; \
+ptys=$enable_ptys; zippy=$enable_zippy; sigint=$enable_sigint"
+
+AC_SUBST(CONFIGURE_OPTIONS)
+
dnl | output Makefile
AC_CONFIG_FILES([Makefile cmail po/Makefile.in])
AC_CONFIG_COMMANDS([test-stamp-h],[test -z "$CONFIG_HEADERS" || date > stamp-h])
echo " Xaw3d: $with_Xaw3d"
echo " Xaw: $with_Xaw"
echo ""
-echo " xpm: $enable_xpm"
echo " ptys: $enable_ptys"
echo " zippy: $enable_zippy"
echo " sigint: $enable_sigint"