Fix linux makefiles

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for darkradiant 2.2.0.
+# Generated by GNU Autoconf 2.69 for darkradiant 2.2.1.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='darkradiant'
 PACKAGE_TARNAME='darkradiant'
-PACKAGE_VERSION='2.2.0'
-PACKAGE_STRING='darkradiant 2.2.0'
+PACKAGE_VERSION='2.2.1'
+PACKAGE_STRING='darkradiant 2.2.1'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1442,7 +1442,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures darkradiant 2.2.0 to adapt to many kinds of systems.
+\`configure' configures darkradiant 2.2.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1513,7 +1513,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of darkradiant 2.2.0:";;
+     short | recursive ) echo "Configuration of darkradiant 2.2.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1661,7 +1661,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-darkradiant configure 2.2.0
+darkradiant configure 2.2.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2147,7 +2147,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by darkradiant $as_me 2.2.0, which was
+It was created by darkradiant $as_me 2.2.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3011,7 +3011,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='darkradiant'
- VERSION='2.2.0'
+ VERSION='2.2.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -22645,7 +22645,11 @@ fi
 # Configure global flags, cancelling any modifications we may have made during
 # configuration
 WARNING_FLAGS="-Wall -Wno-unused-variable -Werror=return-type"
-# clang: -Wno-inconsistent-missing-override -Wno-potentially-evaluated-expression
+
+if test "$build_osx" != "no"; then
+    WARNING_FLAGS="$WARNING_FLAGS -Wno-inconsistent-missing-override -Wno-potentially-evaluated-expression"
+fi
+
 CFLAGS="$USER_CFLAGS $WARNING_FLAGS $WX_CFLAGS"
 CXXFLAGS="$USER_CXXFLAGS $WARNING_FLAGS $WX_CXXFLAGS_ONLY"
 CPPFLAGS="$USER_CPPFLAGS -DPOSIX $WX_CPPFLAGS $LIBSIGC_CFLAGS -DWXINTL_NO_GETTEXT_MACRO"
@@ -22670,7 +22674,7 @@ fi
 # Generate output files
 ac_config_headers="$ac_config_headers config.h"
 
-ac_config_files="$ac_config_files install/darkradiant.desktop install/i18n//Makefile.in Makefile radiant/Makefile install/i18n/Makefile.in libs/Makefile libs/ddslib/Makefile libs/wxutil/Makefile libs/math/Makefile libs/picomodel/Makefile libs/scene/Makefile libs/xmlutil/Makefile plugins/Makefile plugins/archivezip/Makefile plugins/commandsystem/Makefile plugins/eclassmgr/Makefile plugins/eclasstree/Makefile plugins/entity/Makefile plugins/entitylist/Makefile plugins/eventmanager/Makefile plugins/filetypes/Makefile plugins/filters/Makefile plugins/fonts/Makefile plugins/grid/Makefile plugins/image/Makefile plugins/mapdoom3/Makefile plugins/md5model/Makefile plugins/model/Makefile plugins/particles/Makefile plugins/scenegraph/Makefile plugins/script/Makefile plugins/shaders/Makefile plugins/skins/Makefile plugins/sound/Makefile plugins/uimanager/Makefile plugins/undo/Makefile plugins/vfspk3/Makefile plugins/xmlregistry/Makefile plugins/dm.stimresponse/Makefile plugins/dm.objectives/Makefile plugins/dm.difficulty/Makefile plugins/dm.gui/Makefile plugins/dm.editing/Makefile plugins/dm.conversation/Makefile"
+ac_config_files="$ac_config_files install/darkradiant.desktop install/i18n//Makefile.in Makefile radiant/Makefile install/i18n/Makefile.in libs/Makefile libs/ddslib/Makefile libs/wxutil/Makefile libs/math/Makefile libs/picomodel/Makefile libs/scene/Makefile libs/xmlutil/Makefile plugins/Makefile plugins/archivezip/Makefile plugins/commandsystem/Makefile plugins/eclassmgr/Makefile plugins/eclasstree/Makefile plugins/entity/Makefile plugins/entitylist/Makefile plugins/eventmanager/Makefile plugins/filetypes/Makefile plugins/filters/Makefile plugins/fonts/Makefile plugins/image/Makefile plugins/mapdoom3/Makefile plugins/md5model/Makefile plugins/model/Makefile plugins/particles/Makefile plugins/scenegraph/Makefile plugins/script/Makefile plugins/shaders/Makefile plugins/skins/Makefile plugins/sound/Makefile plugins/uimanager/Makefile plugins/undo/Makefile plugins/vfspk3/Makefile plugins/xmlregistry/Makefile plugins/dm.stimresponse/Makefile plugins/dm.objectives/Makefile plugins/dm.difficulty/Makefile plugins/dm.gui/Makefile plugins/dm.editing/Makefile plugins/dm.conversation/Makefile"
 
 
 cat >confcache <<\_ACEOF
@@ -23207,7 +23211,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by darkradiant $as_me 2.2.0, which was
+This file was extended by darkradiant $as_me 2.2.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -23273,7 +23277,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-darkradiant config.status 2.2.0
+darkradiant config.status 2.2.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -23817,7 +23821,6 @@ do
     "plugins/filetypes/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/filetypes/Makefile" ;;
     "plugins/filters/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/filters/Makefile" ;;
     "plugins/fonts/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/fonts/Makefile" ;;
-    "plugins/grid/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/grid/Makefile" ;;
     "plugins/image/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/image/Makefile" ;;
     "plugins/mapdoom3/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/mapdoom3/Makefile" ;;
     "plugins/md5model/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/md5model/Makefile" ;;

configure.ac

@@ -271,7 +271,6 @@ AC_CONFIG_FILES([install/darkradiant.desktop install/i18n//Makefile.in
                  plugins/filetypes/Makefile
                  plugins/filters/Makefile
                  plugins/fonts/Makefile
-                 plugins/grid/Makefile
                  plugins/image/Makefile
                  plugins/mapdoom3/Makefile
                  plugins/md5model/Makefile

plugins/Makefile.in

@@ -398,7 +398,7 @@ top_srcdir = @top_srcdir@
 
 # Optional plugins
 SUBDIRS = eventmanager archivezip commandsystem eclassmgr eclasstree \
-	entity entitylist filetypes filters fonts grid image mapdoom3 \
+	entity entitylist filetypes filters fonts image mapdoom3 \
 	md5model model particles scenegraph shaders skins uimanager \
 	undo vfspk3 xmlregistry @sound_module@ @script_module@ \
 	@sr_plugin@ @obj_plugin@ @difficulty_plugin@ @conv_plugin@ \