X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=configure.ac;h=45dfec814db4127868fed35495822f48d501b646;hb=a685406f7cb3a68bd37def6aca7b9b4077fc31a7;hp=ec038506ab762b13f09b7dbcd99d4ba0b1fb5c86;hpb=4d54c79829d19389bcb7fa5000f76cfe7a0aaf36;p=xboard.git

diff --git a/configure.ac b/configure.ac
index ec03850..45dfec8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,7 @@ 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],[4.7.1],[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])
@@ -138,18 +138,54 @@ FRONTEND_LIBS=""
 
 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="no"])
+
+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
@@ -515,8 +551,12 @@ echo " Configurations summary:"
 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 ""