dnl| the standard version of xboard.
dnl| define second argument as VERSION.PATCHLEVEL. e.g. 4.4.0j
-AC_INIT([xboard],[4.7.2],[bug-xboard@gnu.org])
+AC_INIT([xboard],[master-20130828],[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])
AC_ARG_WITH([gtk],
[AS_HELP_STRING([--with-gtk],[use GTK front-end (experimental)])],
- [with_GTK=yes],
- [with_GTK=no])
+ [with_GTK=$withval],
+ [with_GTK="no"])
AC_ARG_WITH([Xaw3d],
[AS_HELP_STRING([--with-Xaw3d],[use Xaw3d front-end (not fully supported anymore)])],
- [with_Xaw3d=yes],
- [with_Xaw3d=no])
+ [with_Xaw3d="$withval"],
+ [with_Xaw3d="no"])
AC_ARG_WITH([Xaw],
[AS_HELP_STRING([--with-Xaw],[use Xaw front-end (default)])],
- [with_Xaw=yes],
- [with_Xaw=no])
+ [with_Xaw="$withval"],
+ [with_Xaw="yes"])
+
+AC_ARG_WITH([iconsdir],
+ [AS_HELP_STRING([--with-iconsdir=DIR],
+ [path where icons get installed (default: $datadir/icons/hicolor/48x48/apps)])],
+ [ICONSDIR="$withval"],
+ [ICONSDIR='$(datadir)/icons/hicolor/48x48/apps'])
+
+AC_ARG_WITH([svgiconsdir],
+ [AS_HELP_STRING([--with-svgiconsdir=DIR],
+ [path where svg icons get installed (default: $datadir/icons/hicolor/scalable/apps)])],
+ [SVGICONSDIR="$withval"],
+ [SVGICONSDIR='$(datadir)/icons/hicolor/scalable/apps'])
+
+AC_ARG_WITH([desktopdir],
+ [AS_HELP_STRING([--with-desktopdir=DIR],
+ [path where desktop files get installed (default: $datadir/applications)])],
+ [DESKTOPDIR="$withval"],
+ [DESKTOPDIR='$(datadir)/applications'])
+
+AC_ARG_WITH([mimedir],
+ [AS_HELP_STRING([--with-mimedir=DIR],
+ [path where mime files get installed (default: $datadir/mime/packages)])],
+ [MIMEDIR="$withval"],
+ [MIMEDIR='$(datadir)/mime/packages'])
+
+AC_ARG_WITH([gamedatadir],
+ [AS_HELP_STRING([--with-gamedatadir=DIR],
+ [path where game data files get installed (default: $datadir/games/xboard)])],
+ [GAMEDATADIR="$withval"],
+ [GAMEDATADIR='$(datadir)/games/xboard'])
+
+AC_SUBST(ICONSDIR)
+AC_SUBST(SVGICONSDIR)
+AC_SUBST(DESKTOPDIR)
+AC_SUBST(MIMEDIR)
+AC_SUBST(GAMEDATADIR)
dnl | check for libraries
if test x"$with_GTK" = x"yes" ; then
PKG_CHECK_MODULES([GTK], [ gtk+-2.0 >= 2.16.0 gmodule-2.0 ])
FRONTEND_CFLAGS=$GTK_CFLAGS
FRONTEND_LIBS=$GTK_LIBS
+ with_Xaw="no"
fi
if test x"$with_GTK" = x"no" ; then
dnl | make results available in Makefile.am
AM_CONDITIONAL([withGTK], [test x"$with_GTK" = x"yes"])
-AM_CONDITIONAL([withXaw], [test x"$with_Xaw3d" = x"yes"])
-AM_CONDITIONAL([withXaw], [test x"$with_Xaw" = x"yes"])
+AM_CONDITIONAL([withXaw], [test x"$with_Xaw3d" = x"yes" || test x"$with_Xaw" = x"yes"])
AC_SUBST(FRONTEND_CFLAGS)
;;
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(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 ""
echo " prefix: $prefix "
echo " datarootdir: $datarootdir "
-echo " datadir: $datadir (icons will go in \$datadir/icons/hicolor/...)"
-echo " (bitmaps will go in \$datadir/games/xboard/...)"
+echo " datadir: $datadir "
+echo " gamedatadir: $GAMEDATADIR "
+echo " desktopdir: $DESKTOPDIR "
+echo " mimedir: $MIMEDIR "
+echo " iconsdir: $ICONSDIR "
+echo " svgiconsdir: $SVGICONSDIR "
echo " infodir: $infodir (info files will go here)"
echo " sysconfdir: $sysconfdir (xboard.conf will go here)"
echo ""
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"
projects / xboard.git / blobdiff