X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=configure.ac;h=a1afa25a52551bc4a8d9eb2fca771e96d9f86d1a;hb=ee7ad29e757ab4f99b8b776ce7e8ebee5081767a;hp=0a1f77d14c68ae77403f6bcfc01ccfd23f52a13b;hpb=e70077aab0199817f37aef9ed0bdba1bbca93b45;p=xboard.git

diff --git a/configure.ac b/configure.ac
index 0a1f77d..a1afa25 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],[master-20110822],[bug-xboard@gnu.org])
+AC_INIT([xboard],[master-20120430],[bug-xboard@gnu.org])
 
 dnl| need this to be able to compile some files in a subdir (filebrowser)
 AM_INIT_AUTOMAKE([subdir-objects])
@@ -110,6 +110,15 @@ AC_CHECK_FUNC(setlocale, [],
 
 AC_CHECK_LIB(seq, getpseudotty)
 
+dnl | add compiler warnings only if compiler understands them
+AC_MSG_CHECKING(whether compiler understands -Wall -Wno-parentheses)
+SAVE_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS -Wall -Wno-parentheses"
+AC_TRY_COMPILE([],[],
+  AC_MSG_RESULT(yes),
+  AC_MSG_RESULT(no)
+  CFLAGS="$SAVE_CFLAGS")
+
 
 dnl | check for X-libraries
 AC_PATH_XTRA
@@ -120,7 +129,13 @@ if test -n "$no_x" ; then
   exit 1
 fi
 
+save_cflags="$CFLAGS"
+save_cppflags="$CPPFLAGS"
+CFLAGS="$CFLAGS $X_CFLAGS"
+CPPFLAGS="$CPPFLAGS $X_CFLAGS"
 AC_CHECK_HEADER(X11/Intrinsic.h,xt="yes",xt="no")
+CFLAGS="$save_cflags"
+CPPFLAGS="$save_cppflags"
 
 if test "$xt" = "no" ; then
    echo Xt headers not found
@@ -147,7 +162,13 @@ AS_IF([test x"$with_Xaw3d" != x"no"],
 			       [-lXaw])])
 dnl | no Xaw3d, check for Xaw
 if test x"$with_Xaw3d" = x"no" ; then
+   save_cflags="$CFLAGS"
+   save_cppflags="$CPPFLAGS"
+   CFLAGS="$CFLAGS $X_CFLAGS"
+   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
    AC_CHECK_HEADER(X11/Xaw/Dialog.h,xaw_headers="yes", xaw_headers="no")
+   CFLAGS="$save_cflags"
+   CPPFLAGS="$save_cppflags"
    if test x"$xaw_headers" = x"no" ; then
       AC_MSG_ERROR([Xaw headers not found. Please install the Xaw package and headers.])
    fi
@@ -344,10 +365,12 @@ AC_ARG_ENABLE(	[xpm],
 
 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"
@@ -416,7 +439,24 @@ X_LIBS="$X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS -lXmu -lX11 -lXt "
 AC_SUBST(X_CFLAGS)
 AC_SUBST(X_LIBS)
 
+dnl | should we install desktop icons and mime associations?
+AC_ARG_ENABLE(	[update-mimedb],
+		[AS_HELP_STRING([--disable-update-mimedb],[disable the update-mime-database after install [default=no]])],
+		[enable_mimedb="no"],
+		[enable_mimedb="yes"])
+
+AM_CONDITIONAL(ENABLE_UPDATE_MIMEDB, test x"$enable_mimedb" = "xyes")
+
+if test x"$enable_mimedb" = "xyes"; then
+   AC_PATH_PROG([XDG_MIME],[xdg-mime])
+   AC_SUBST(XDG_MIME)
+   AC_PATH_PROG([XDG_DESKTOP_MENU],[xdg-desktop-menu])
+   AC_SUBST(XDG_DESKTOP_MENU)
+   AC_PATH_PROG([XDG_ICON_RESOURCE],[xdg-icon-resource])
+   AC_SUBST(XDG_ICON_RESOURCE)
+fi
 
+dnl |  output Makefile
 AC_CONFIG_FILES([Makefile cmail po/Makefile.in])
 AC_CONFIG_COMMANDS([test-stamp-h],[test -z "$CONFIG_HEADERS" || date > stamp-h])
 AC_CONFIG_COMMANDS([chmod-cmail],[chmod 755 cmail])
@@ -435,6 +475,8 @@ echo "                                    (bitmaps will go in \$datadir/games/xb
 echo "        infodir:         $infodir   (info files will go here)"
 echo "        sysconfdir:      $sysconfdir   (xboard.conf will go here)"
 echo ""
+echo "        update mimedb:   $enable_mimedb"
+echo ""
 echo "        NLS support:     $USE_NLS"
 echo ""
 echo "        Xaw3d:           $with_Xaw3d"