X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=configure.ac;h=5189be76b0ac75667323cf34e7d86295abf35eaf;hb=e6e38912837a4fe2464356408d10dee950b3121c;hp=45dfec814db4127868fed35495822f48d501b646;hpb=a685406f7cb3a68bd37def6aca7b9b4077fc31a7;p=xboard.git diff --git a/configure.ac b/configure.ac index 45dfec8..5189be7 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ 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 @@ -56,7 +56,6 @@ AH_TEMPLATE([USE_PTYS],[template]) 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]) @@ -149,37 +148,37 @@ AC_ARG_WITH([Xaw3d], AC_ARG_WITH([Xaw], [AS_HELP_STRING([--with-Xaw],[use Xaw front-end (default)])], [with_Xaw="$withval"], - [with_Xaw="no"]) + [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']) + [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']) + [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']) + [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']) + [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']) + [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) @@ -192,6 +191,7 @@ 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 @@ -248,8 +248,7 @@ fi 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) @@ -436,29 +435,6 @@ dnl| add some libs for OS X ;; 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) @@ -537,6 +513,17 @@ if test x"$enable_mimedb" = "xyes"; then 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]) @@ -568,7 +555,6 @@ echo " GTK: $with_GTK" 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"