X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=configure.ac;h=4cf6a2f8c8501be14a4894d5f9e9e3c77d7cf9d0;hb=64a3d6f1b363df4b2b11d8cb95a097f68612323d;hp=c946f4ec033aa318c11a5b49386afc9b6580510d;hpb=356647c90da4718630c8cfed1a00f416d00aa93f;p=xboard.git

diff --git a/configure.ac b/configure.ac
index c946f4e..4cf6a2f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -152,34 +152,34 @@ AC_ARG_WITH([Xaw],
             [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 +192,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
@@ -536,6 +537,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; xpm=$enable_xpm; \
+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])