New makefile, things should built again

Makefile.am

@@ -37,171 +37,172 @@ magicseteditor_CXXFLAGS += -fpch-deps
 endif
 
 # The script used to generate is MakeAM.sh
-magicseteditor_SOURCES += ./src/code_template.cpp
-magicseteditor_SOURCES += ./src/cli/win32_cli_wrapper.cpp
+magicseteditor_SOURCES += ./src/main.cpp
 magicseteditor_SOURCES += ./src/cli/cli_main.cpp
+magicseteditor_SOURCES += ./src/cli/win32_cli_wrapper.cpp
 magicseteditor_SOURCES += ./src/cli/text_io_handler.cpp
 magicseteditor_SOURCES += ./src/gfx/rotate_image.cpp
-magicseteditor_SOURCES += ./src/gfx/resample_image.cpp
-magicseteditor_SOURCES += ./src/gfx/resample_text.cpp
-magicseteditor_SOURCES += ./src/gfx/bezier.cpp
-magicseteditor_SOURCES += ./src/gfx/blend_image.cpp
-magicseteditor_SOURCES += ./src/gfx/polynomial.cpp
+magicseteditor_SOURCES += ./src/gfx/generated_image.cpp
 magicseteditor_SOURCES += ./src/gfx/color.cpp
+magicseteditor_SOURCES += ./src/gfx/polynomial.cpp
+magicseteditor_SOURCES += ./src/gfx/combine_image.cpp
+magicseteditor_SOURCES += ./src/gfx/bezier.cpp
+magicseteditor_SOURCES += ./src/gfx/resample_text.cpp
+magicseteditor_SOURCES += ./src/gfx/resample_image.cpp
 magicseteditor_SOURCES += ./src/gfx/image_effects.cpp
-magicseteditor_SOURCES += ./src/gfx/generated_image.cpp
 magicseteditor_SOURCES += ./src/gfx/mask_image.cpp
-magicseteditor_SOURCES += ./src/gfx/combine_image.cpp
+magicseteditor_SOURCES += ./src/gfx/blend_image.cpp
 magicseteditor_SOURCES += ./src/script/value.cpp
-magicseteditor_SOURCES += ./src/script/functions/spelling.cpp
-magicseteditor_SOURCES += ./src/script/functions/construction.cpp
-magicseteditor_SOURCES += ./src/script/functions/editor.cpp
-magicseteditor_SOURCES += ./src/script/functions/regex.cpp
-magicseteditor_SOURCES += ./src/script/functions/export.cpp
+magicseteditor_SOURCES += ./src/script/script_manager.cpp
 magicseteditor_SOURCES += ./src/script/functions/basic.cpp
-magicseteditor_SOURCES += ./src/script/functions/english.cpp
+magicseteditor_SOURCES += ./src/script/functions/regex.cpp
+magicseteditor_SOURCES += ./src/script/functions/editor.cpp
+magicseteditor_SOURCES += ./src/script/functions/construction.cpp
+magicseteditor_SOURCES += ./src/script/functions/spelling.cpp
 magicseteditor_SOURCES += ./src/script/functions/image.cpp
-magicseteditor_SOURCES += ./src/script/script.cpp
-magicseteditor_SOURCES += ./src/script/profiler.cpp
-magicseteditor_SOURCES += ./src/script/context.cpp
-magicseteditor_SOURCES += ./src/script/parser.cpp
-magicseteditor_SOURCES += ./src/script/scriptable.cpp
+magicseteditor_SOURCES += ./src/script/functions/english.cpp
+magicseteditor_SOURCES += ./src/script/functions/export.cpp
 magicseteditor_SOURCES += ./src/script/dependency.cpp
-magicseteditor_SOURCES += ./src/script/script_manager.cpp
+magicseteditor_SOURCES += ./src/script/parser.cpp
+magicseteditor_SOURCES += ./src/script/context.cpp
 magicseteditor_SOURCES += ./src/script/image.cpp
-magicseteditor_SOURCES += ./src/util/vcs.cpp
-magicseteditor_SOURCES += ./src/util/action_stack.cpp
+magicseteditor_SOURCES += ./src/script/profiler.cpp
+magicseteditor_SOURCES += ./src/script/scriptable.cpp
+magicseteditor_SOURCES += ./src/script/script.cpp
+magicseteditor_SOURCES += ./src/gui/preferences_window.cpp
+magicseteditor_SOURCES += ./src/gui/profiler_window.cpp
+magicseteditor_SOURCES += ./src/gui/symbol/basic_shape_editor.cpp
+magicseteditor_SOURCES += ./src/gui/symbol/point_editor.cpp
+magicseteditor_SOURCES += ./src/gui/symbol/part_list.cpp
+magicseteditor_SOURCES += ./src/gui/symbol/symmetry_editor.cpp
+magicseteditor_SOURCES += ./src/gui/symbol/selection.cpp
+magicseteditor_SOURCES += ./src/gui/symbol/window.cpp
+magicseteditor_SOURCES += ./src/gui/symbol/editor.cpp
+magicseteditor_SOURCES += ./src/gui/symbol/select_editor.cpp
+magicseteditor_SOURCES += ./src/gui/symbol/control.cpp
+magicseteditor_SOURCES += ./src/gui/card_select_window.cpp
+magicseteditor_SOURCES += ./src/gui/control/card_list.cpp
+magicseteditor_SOURCES += ./src/gui/control/gallery_list.cpp
+magicseteditor_SOURCES += ./src/gui/control/keyword_list.cpp
+magicseteditor_SOURCES += ./src/gui/control/graph.cpp
+magicseteditor_SOURCES += ./src/gui/control/image_card_list.cpp
+magicseteditor_SOURCES += ./src/gui/control/card_viewer.cpp
+magicseteditor_SOURCES += ./src/gui/control/native_look_editor.cpp
+magicseteditor_SOURCES += ./src/gui/control/select_card_list.cpp
+magicseteditor_SOURCES += ./src/gui/control/item_list.cpp
+magicseteditor_SOURCES += ./src/gui/control/text_ctrl.cpp
+magicseteditor_SOURCES += ./src/gui/control/card_editor.cpp
+magicseteditor_SOURCES += ./src/gui/control/filtered_card_list.cpp
+magicseteditor_SOURCES += ./src/gui/control/package_list.cpp
+magicseteditor_SOURCES += ./src/gui/control/tree_list.cpp
+magicseteditor_SOURCES += ./src/gui/control/card_list_column_select.cpp
+magicseteditor_SOURCES += ./src/gui/package_update_list.cpp
+magicseteditor_SOURCES += ./src/gui/drop_down_list.cpp
+magicseteditor_SOURCES += ./src/gui/value/symbol.cpp
+magicseteditor_SOURCES += ./src/gui/value/package_choice.cpp
+magicseteditor_SOURCES += ./src/gui/value/color.cpp
+magicseteditor_SOURCES += ./src/gui/value/text.cpp
+magicseteditor_SOURCES += ./src/gui/value/multiple_choice.cpp
+magicseteditor_SOURCES += ./src/gui/value/editor.cpp
+magicseteditor_SOURCES += ./src/gui/value/information.cpp
+magicseteditor_SOURCES += ./src/gui/value/choice.cpp
+magicseteditor_SOURCES += ./src/gui/value/image.cpp
+magicseteditor_SOURCES += ./src/gui/packages_window.cpp
+magicseteditor_SOURCES += ./src/gui/set/keywords_panel.cpp
+magicseteditor_SOURCES += ./src/gui/set/panel.cpp
+magicseteditor_SOURCES += ./src/gui/set/random_pack_panel.cpp
+magicseteditor_SOURCES += ./src/gui/set/window.cpp
+magicseteditor_SOURCES += ./src/gui/set/stats_panel.cpp
+magicseteditor_SOURCES += ./src/gui/set/cards_panel.cpp
+magicseteditor_SOURCES += ./src/gui/set/style_panel.cpp
+magicseteditor_SOURCES += ./src/gui/set/set_info_panel.cpp
+magicseteditor_SOURCES += ./src/gui/html_export_window.cpp
+magicseteditor_SOURCES += ./src/gui/new_window.cpp
+magicseteditor_SOURCES += ./src/gui/thumbnail_thread.cpp
+magicseteditor_SOURCES += ./src/gui/util.cpp
+magicseteditor_SOURCES += ./src/gui/welcome_window.cpp
+magicseteditor_SOURCES += ./src/gui/auto_replace_window.cpp
+magicseteditor_SOURCES += ./src/gui/image_slice_window.cpp
+magicseteditor_SOURCES += ./src/gui/about_window.cpp
+magicseteditor_SOURCES += ./src/gui/print_window.cpp
+magicseteditor_SOURCES += ./src/gui/images_export_window.cpp
+magicseteditor_SOURCES += ./src/gui/update_checker.cpp
+magicseteditor_SOURCES += ./src/gui/icon_menu.cpp
+magicseteditor_SOURCES += ./src/code_template.cpp
+magicseteditor_SOURCES += ./src/util/error.cpp
+magicseteditor_SOURCES += ./src/util/file_utils.cpp
+magicseteditor_SOURCES += ./src/util/alignment.cpp
+magicseteditor_SOURCES += ./src/util/string.cpp
 magicseteditor_SOURCES += ./src/util/tagged_string.cpp
-magicseteditor_SOURCES += ./src/util/vcs/subversion.cpp
+magicseteditor_SOURCES += ./src/util/age.cpp
+magicseteditor_SOURCES += ./src/util/action_stack.cpp
 magicseteditor_SOURCES += ./src/util/regex.cpp
-magicseteditor_SOURCES += ./src/util/error.cpp
+magicseteditor_SOURCES += ./src/util/vcs.cpp
+magicseteditor_SOURCES += ./src/util/rotation.cpp
 magicseteditor_SOURCES += ./src/util/spec_sort.cpp
 magicseteditor_SOURCES += ./src/util/spell_checker.cpp
-magicseteditor_SOURCES += ./src/util/file_utils.cpp
-magicseteditor_SOURCES += ./src/util/age.cpp
-magicseteditor_SOURCES += ./src/util/io/package.cpp
+magicseteditor_SOURCES += ./src/util/version.cpp
+magicseteditor_SOURCES += ./src/util/io/get_member.cpp
 magicseteditor_SOURCES += ./src/util/io/package_manager.cpp
-magicseteditor_SOURCES += ./src/util/io/reader.cpp
 magicseteditor_SOURCES += ./src/util/io/writer.cpp
-magicseteditor_SOURCES += ./src/util/io/get_member.cpp
-magicseteditor_SOURCES += ./src/util/string.cpp
-magicseteditor_SOURCES += ./src/util/version.cpp
-magicseteditor_SOURCES += ./src/util/alignment.cpp
-magicseteditor_SOURCES += ./src/util/rotation.cpp
-magicseteditor_SOURCES += ./src/main.cpp
-magicseteditor_SOURCES += ./src/data/stylesheet.cpp
-magicseteditor_SOURCES += ./src/data/card.cpp
-magicseteditor_SOURCES += ./src/data/settings.cpp
-magicseteditor_SOURCES += ./src/data/field/multiple_choice.cpp
-magicseteditor_SOURCES += ./src/data/field/choice.cpp
-magicseteditor_SOURCES += ./src/data/field/package_choice.cpp
+magicseteditor_SOURCES += ./src/util/io/reader.cpp
+magicseteditor_SOURCES += ./src/util/io/package.cpp
+magicseteditor_SOURCES += ./src/util/vcs/subversion.cpp
+magicseteditor_SOURCES += ./src/render/symbol/viewer.cpp
+magicseteditor_SOURCES += ./src/render/symbol/filter.cpp
+magicseteditor_SOURCES += ./src/render/value/symbol.cpp
+magicseteditor_SOURCES += ./src/render/value/package_choice.cpp
+magicseteditor_SOURCES += ./src/render/value/color.cpp
+magicseteditor_SOURCES += ./src/render/value/viewer.cpp
+magicseteditor_SOURCES += ./src/render/value/text.cpp
+magicseteditor_SOURCES += ./src/render/value/multiple_choice.cpp
+magicseteditor_SOURCES += ./src/render/value/information.cpp
+magicseteditor_SOURCES += ./src/render/value/choice.cpp
+magicseteditor_SOURCES += ./src/render/value/image.cpp
+magicseteditor_SOURCES += ./src/render/text/symbol.cpp
+magicseteditor_SOURCES += ./src/render/text/viewer.cpp
+magicseteditor_SOURCES += ./src/render/text/element.cpp
+magicseteditor_SOURCES += ./src/render/text/font.cpp
+magicseteditor_SOURCES += ./src/render/text/compound.cpp
+magicseteditor_SOURCES += ./src/render/card/viewer.cpp
+magicseteditor_SOURCES += ./src/data/field.cpp
+magicseteditor_SOURCES += ./src/data/keyword.cpp
+magicseteditor_SOURCES += ./src/data/symbol.cpp
+magicseteditor_SOURCES += ./src/data/game.cpp
+magicseteditor_SOURCES += ./src/data/pack.cpp
 magicseteditor_SOURCES += ./src/data/field/symbol.cpp
-magicseteditor_SOURCES += ./src/data/field/information.cpp
-magicseteditor_SOURCES += ./src/data/field/boolean.cpp
+magicseteditor_SOURCES += ./src/data/field/package_choice.cpp
 magicseteditor_SOURCES += ./src/data/field/color.cpp
-magicseteditor_SOURCES += ./src/data/field/image.cpp
 magicseteditor_SOURCES += ./src/data/field/text.cpp
-magicseteditor_SOURCES += ./src/data/font.cpp
-magicseteditor_SOURCES += ./src/data/action/value.cpp
-magicseteditor_SOURCES += ./src/data/action/keyword.cpp
-magicseteditor_SOURCES += ./src/data/action/symbol_part.cpp
-magicseteditor_SOURCES += ./src/data/action/set.cpp
-magicseteditor_SOURCES += ./src/data/action/symbol.cpp
-magicseteditor_SOURCES += ./src/data/keyword.cpp
+magicseteditor_SOURCES += ./src/data/field/multiple_choice.cpp
+magicseteditor_SOURCES += ./src/data/field/boolean.cpp
+magicseteditor_SOURCES += ./src/data/field/information.cpp
+magicseteditor_SOURCES += ./src/data/field/choice.cpp
+magicseteditor_SOURCES += ./src/data/field/image.cpp
+magicseteditor_SOURCES += ./src/data/locale.cpp
 magicseteditor_SOURCES += ./src/data/add_cards_script.cpp
-magicseteditor_SOURCES += ./src/data/set.cpp
+magicseteditor_SOURCES += ./src/data/card.cpp
 magicseteditor_SOURCES += ./src/data/export_template.cpp
-magicseteditor_SOURCES += ./src/data/game.cpp
-magicseteditor_SOURCES += ./src/data/field.cpp
-magicseteditor_SOURCES += ./src/data/installer.cpp
-magicseteditor_SOURCES += ./src/data/locale.cpp
-magicseteditor_SOURCES += ./src/data/symbol.cpp
-magicseteditor_SOURCES += ./src/data/word_list.cpp
-magicseteditor_SOURCES += ./src/data/pack.cpp
-magicseteditor_SOURCES += ./src/data/statistics.cpp
-magicseteditor_SOURCES += ./src/data/format/html.cpp
-magicseteditor_SOURCES += ./src/data/format/apprentice.cpp
+magicseteditor_SOURCES += ./src/data/symbol_font.cpp
 magicseteditor_SOURCES += ./src/data/format/mtg_editor.cpp
-magicseteditor_SOURCES += ./src/data/format/mws.cpp
+magicseteditor_SOURCES += ./src/data/format/mse1.cpp
+magicseteditor_SOURCES += ./src/data/format/clipboard.cpp
 magicseteditor_SOURCES += ./src/data/format/image_to_symbol.cpp
+magicseteditor_SOURCES += ./src/data/format/html.cpp
+magicseteditor_SOURCES += ./src/data/format/apprentice.cpp
 magicseteditor_SOURCES += ./src/data/format/formats.cpp
-magicseteditor_SOURCES += ./src/data/format/clipboard.cpp
-magicseteditor_SOURCES += ./src/data/format/mse1.cpp
-magicseteditor_SOURCES += ./src/data/format/mse2.cpp
 magicseteditor_SOURCES += ./src/data/format/image.cpp
-magicseteditor_SOURCES += ./src/data/symbol_font.cpp
-magicseteditor_SOURCES += ./src/render/value/multiple_choice.cpp
-magicseteditor_SOURCES += ./src/render/value/choice.cpp
-magicseteditor_SOURCES += ./src/render/value/package_choice.cpp
-magicseteditor_SOURCES += ./src/render/value/viewer.cpp
-magicseteditor_SOURCES += ./src/render/value/symbol.cpp
-magicseteditor_SOURCES += ./src/render/value/information.cpp
-magicseteditor_SOURCES += ./src/render/value/color.cpp
-magicseteditor_SOURCES += ./src/render/value/image.cpp
-magicseteditor_SOURCES += ./src/render/value/text.cpp
-magicseteditor_SOURCES += ./src/render/card/viewer.cpp
-magicseteditor_SOURCES += ./src/render/text/font.cpp
-magicseteditor_SOURCES += ./src/render/text/element.cpp
-magicseteditor_SOURCES += ./src/render/text/viewer.cpp
-magicseteditor_SOURCES += ./src/render/text/symbol.cpp
-magicseteditor_SOURCES += ./src/render/text/compound.cpp
-magicseteditor_SOURCES += ./src/render/symbol/viewer.cpp
-magicseteditor_SOURCES += ./src/render/symbol/filter.cpp
-magicseteditor_SOURCES += ./src/gui/image_slice_window.cpp
-magicseteditor_SOURCES += ./src/gui/welcome_window.cpp
-magicseteditor_SOURCES += ./src/gui/about_window.cpp
-magicseteditor_SOURCES += ./src/gui/icon_menu.cpp
-magicseteditor_SOURCES += ./src/gui/value/multiple_choice.cpp
-magicseteditor_SOURCES += ./src/gui/value/editor.cpp
-magicseteditor_SOURCES += ./src/gui/value/choice.cpp
-magicseteditor_SOURCES += ./src/gui/value/package_choice.cpp
-magicseteditor_SOURCES += ./src/gui/value/symbol.cpp
-magicseteditor_SOURCES += ./src/gui/value/information.cpp
-magicseteditor_SOURCES += ./src/gui/value/color.cpp
-magicseteditor_SOURCES += ./src/gui/value/image.cpp
-magicseteditor_SOURCES += ./src/gui/value/text.cpp
-magicseteditor_SOURCES += ./src/gui/thumbnail_thread.cpp
-magicseteditor_SOURCES += ./src/gui/auto_replace_window.cpp
-magicseteditor_SOURCES += ./src/gui/update_checker.cpp
-magicseteditor_SOURCES += ./src/gui/new_window.cpp
-magicseteditor_SOURCES += ./src/gui/drop_down_list.cpp
-magicseteditor_SOURCES += ./src/gui/control/select_card_list.cpp
-magicseteditor_SOURCES += ./src/gui/control/image_card_list.cpp
-magicseteditor_SOURCES += ./src/gui/control/keyword_list.cpp
-magicseteditor_SOURCES += ./src/gui/control/filtered_card_list.cpp
-magicseteditor_SOURCES += ./src/gui/control/package_list.cpp
-magicseteditor_SOURCES += ./src/gui/control/gallery_list.cpp
-magicseteditor_SOURCES += ./src/gui/control/text_ctrl.cpp
-magicseteditor_SOURCES += ./src/gui/control/card_list.cpp
-magicseteditor_SOURCES += ./src/gui/control/card_editor.cpp
-magicseteditor_SOURCES += ./src/gui/control/card_list_column_select.cpp
-magicseteditor_SOURCES += ./src/gui/control/item_list.cpp
-magicseteditor_SOURCES += ./src/gui/control/native_look_editor.cpp
-magicseteditor_SOURCES += ./src/gui/control/card_viewer.cpp
-magicseteditor_SOURCES += ./src/gui/control/graph.cpp
-magicseteditor_SOURCES += ./src/gui/control/tree_list.cpp
-magicseteditor_SOURCES += ./src/gui/preferences_window.cpp
-magicseteditor_SOURCES += ./src/gui/print_window.cpp
-magicseteditor_SOURCES += ./src/gui/util.cpp
-magicseteditor_SOURCES += ./src/gui/package_update_list.cpp
-magicseteditor_SOURCES += ./src/gui/set/set_info_panel.cpp
-magicseteditor_SOURCES += ./src/gui/set/window.cpp
-magicseteditor_SOURCES += ./src/gui/set/panel.cpp
-magicseteditor_SOURCES += ./src/gui/set/stats_panel.cpp
-magicseteditor_SOURCES += ./src/gui/set/keywords_panel.cpp
-magicseteditor_SOURCES += ./src/gui/set/cards_panel.cpp
-magicseteditor_SOURCES += ./src/gui/set/random_pack_panel.cpp
-magicseteditor_SOURCES += ./src/gui/set/style_panel.cpp
-magicseteditor_SOURCES += ./src/gui/html_export_window.cpp
-magicseteditor_SOURCES += ./src/gui/images_export_window.cpp
-magicseteditor_SOURCES += ./src/gui/packages_window.cpp
-magicseteditor_SOURCES += ./src/gui/card_select_window.cpp
-magicseteditor_SOURCES += ./src/gui/symbol/part_list.cpp
-magicseteditor_SOURCES += ./src/gui/symbol/editor.cpp
-magicseteditor_SOURCES += ./src/gui/symbol/symmetry_editor.cpp
-magicseteditor_SOURCES += ./src/gui/symbol/window.cpp
-magicseteditor_SOURCES += ./src/gui/symbol/point_editor.cpp
-magicseteditor_SOURCES += ./src/gui/symbol/selection.cpp
-magicseteditor_SOURCES += ./src/gui/symbol/select_editor.cpp
-magicseteditor_SOURCES += ./src/gui/symbol/basic_shape_editor.cpp
-magicseteditor_SOURCES += ./src/gui/symbol/control.cpp
+magicseteditor_SOURCES += ./src/data/format/mws.cpp
+magicseteditor_SOURCES += ./src/data/format/mse2.cpp
+magicseteditor_SOURCES += ./src/data/set.cpp
+magicseteditor_SOURCES += ./src/data/installer.cpp
+magicseteditor_SOURCES += ./src/data/font.cpp
+magicseteditor_SOURCES += ./src/data/statistics.cpp
+magicseteditor_SOURCES += ./src/data/action/keyword.cpp
+magicseteditor_SOURCES += ./src/data/action/symbol.cpp
+magicseteditor_SOURCES += ./src/data/action/value.cpp
+magicseteditor_SOURCES += ./src/data/action/symbol_part.cpp
+magicseteditor_SOURCES += ./src/data/action/set.cpp
+magicseteditor_SOURCES += ./src/data/stylesheet.cpp
+magicseteditor_SOURCES += ./src/data/word_list.cpp
+magicseteditor_SOURCES += ./src/data/settings.cpp

aclocal.m4

-# generated automatically by aclocal 1.11 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 # 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
@@ -13,8 +13,8 @@
 
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,
-[m4_warning([this file was generated for autoconf 2.64.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
+[m4_warning([this file was generated for autoconf 2.65.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.])])
@@ -727,7 +727,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
 [am__api_version='1.11'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.11], [],
+m4_if([$1], [1.11.1], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -743,7 +743,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11])dnl
+[AM_AUTOMAKE_VERSION([1.11.1])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])

configure

 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.64 for magicseteditor 0.3.7b.
+# Generated by GNU Autoconf 2.65 for magicseteditor 0.3.9.
 #
 # Report bugs to <twanvl@users.sourceforge.net>.
 #
+#
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
-# Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
+#
 #
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
@@ -527,7 +529,8 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
-exec 7<&0 </dev/null 6>&1
+test -n "$DJDIR" || exec 7<&0 </dev/null
+exec 6>&1
 
 # Name of the host.
 # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
@@ -549,8 +552,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='magicseteditor'
 PACKAGE_TARNAME='magicseteditor'
-PACKAGE_VERSION='0.3.7b'
-PACKAGE_STRING='magicseteditor 0.3.7b'
+PACKAGE_VERSION='0.3.9'
+PACKAGE_STRING='magicseteditor 0.3.9'
 PACKAGE_BUGREPORT='twanvl@users.sourceforge.net'
 PACKAGE_URL=''
 
@@ -1263,7 +1266,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 magicseteditor 0.3.7b to adapt to many kinds of systems.
+\`configure' configures magicseteditor 0.3.9 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1329,7 +1332,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of magicseteditor 0.3.7b:";;
+     short | recursive ) echo "Configuration of magicseteditor 0.3.9:";;
    esac
   cat <<\_ACEOF
 
@@ -1372,7 +1375,7 @@ Some influential environment variables:
   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
               nonstandard directory <lib dir>
   LIBS        libraries to pass to the linker, e.g. -l<library>
-  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
+  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
   CC          C compiler command
   CFLAGS      C compiler flags
@@ -1444,8 +1447,8 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-magicseteditor configure 0.3.7b
-generated by GNU Autoconf 2.64
+magicseteditor configure 0.3.9
+generated by GNU Autoconf 2.65
 
 Copyright (C) 2009 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
@@ -1492,7 +1495,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_retval=1
 fi
   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  return $ac_retval
+  as_fn_set_status $ac_retval
 
 } # ac_fn_cxx_try_compile
 
@@ -1530,7 +1533,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	ac_retval=1
 fi
   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  return $ac_retval
+  as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_compile
 
@@ -1576,7 +1579,7 @@ fi
   # left behind by Apple's compiler.  We do this before executing the actions.
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  return $ac_retval
+  as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_link
 
@@ -1667,7 +1670,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
     ac_retval=1
 fi
   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  return $ac_retval
+  as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_cpp
 
@@ -1709,7 +1712,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 fi
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  return $ac_retval
+  as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_run
 
@@ -1907,8 +1910,8 @@ 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 magicseteditor $as_me 0.3.7b, which was
-generated by GNU Autoconf 2.64.  Invocation command line was
+It was created by magicseteditor $as_me 0.3.9, which was
+generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
 
@@ -2161,7 +2164,7 @@ fi
 for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 do
   test "x$ac_site_file" = xNONE && continue
-  if test -r "$ac_site_file"; then
+  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
 $as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
@@ -2170,9 +2173,9 @@ $as_echo "$as_me: loading site script $ac_site_file" >&6;}
 done
 
 if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
+  # Some versions of bash will fail to source /dev/null (special files
+  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
+  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
 $as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
@@ -2596,6 +2599,7 @@ IFS=$as_save_IFS
 
 fi
 
+  test -d ./--version && rmdir ./--version
   if test "${ac_cv_path_mkdir+set}" = set; then
     MKDIR_P="$ac_cv_path_mkdir -p"
   else
@@ -2603,7 +2607,6 @@ fi
     # value for MKDIR_P within a source directory, because that will
     # break other packages using the cache if that directory is
     # removed, or if the value is a relative name.
-    test -d ./--version && rmdir ./--version
     MKDIR_P="$ac_install_sh -d"
   fi
 fi
@@ -2720,7 +2723,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='magicseteditor'
- VERSION='0.3.7b'
+ VERSION='0.3.9'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2895,32 +2898,30 @@ $as_echo "$ac_try_echo"; } >&5
 ... rest of stderr output deleted ...
          10q' conftest.err >conftest.er1
     cat conftest.er1 >&5
-    rm -f conftest.er1 conftest.err
   fi
+  rm -f conftest.er1 conftest.err
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 done
 
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
+
 int
 main ()
 {
-FILE *f = fopen ("conftest.out", "w");
- return ferror (f) || fclose (f) != 0;
 
   ;
   return 0;
 }
 _ACEOF
 ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler default output file name" >&5
-$as_echo_n "checking for C++ compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C++ compiler works" >&5
+$as_echo_n "checking whether the C++ compiler works... " >&6; }
 ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
 
 # The possible output files:
@@ -2982,10 +2983,10 @@ test "$ac_cv_exeext" = no && ac_cv_exeext=
 else
   ac_file=''
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
 if test -z "$ac_file"; then :
-  $as_echo "$as_me: failed program was:" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
@@ -2993,51 +2994,18 @@ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 { as_fn_set_status 77
 as_fn_error "C++ compiler cannot create executables
 See \`config.log' for more details." "$LINENO" 5; }; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler default output file name" >&5
+$as_echo_n "checking for C++ compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
 ac_exeext=$ac_cv_exeext
 
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C++ compiler works" >&5
-$as_echo_n "checking whether the C++ compiler works... " >&6; }
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
-  if { ac_try='./$ac_file'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run C++ compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." "$LINENO" 5; }
-    fi
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
 $as_echo_n "checking for suffix of executables... " >&6; }
 if { { ac_try="$ac_link"
@@ -3070,13 +3038,72 @@ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error "cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details." "$LINENO" 5; }
 fi
-rm -f conftest$ac_cv_exeext
+rm -f conftest conftest$ac_cv_exeext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
 $as_echo "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdio.h>
+int
+main ()
+{
+FILE *f = fopen ("conftest.out", "w");
+ return ferror (f) || fclose (f) != 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files="$ac_clean_files conftest.out"
+# Check that the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+if test "$cross_compiling" != yes; then
+  { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+  if { ac_try='./conftest$ac_cv_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then
+    cross_compiling=no
+  else
+    if test "$cross_compiling" = maybe; then
+	cross_compiling=yes
+    else
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "cannot run C++ compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details." "$LINENO" 5; }
+    fi
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+ac_clean_files=$ac_clean_files_save
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
 $as_echo_n "checking for suffix of object files... " >&6; }
 if test "${ac_cv_objext+set}" = set; then :
@@ -3778,8 +3805,8 @@ $as_echo "$ac_try_echo"; } >&5
 ... rest of stderr output deleted ...
          10q' conftest.err >conftest.er1
     cat conftest.er1 >&5
-    rm -f conftest.er1 conftest.err
   fi
+  rm -f conftest.er1 conftest.err
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 done
@@ -6248,8 +6275,8 @@ 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 magicseteditor $as_me 0.3.7b, which was
-generated by GNU Autoconf 2.64.  Invocation command line was
+This file was extended by magicseteditor $as_me 0.3.9, which was
+generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -6289,6 +6316,7 @@ Usage: $0 [OPTION]... [TAG]...
 
   -h, --help       print this help, then exit
   -V, --version    print version number and configuration settings, then exit
+      --config     print configuration, then exit
   -q, --quiet, --silent
                    do not print progress messages
   -d, --debug      don't remove temporary files
@@ -6311,10 +6339,11 @@ Report bugs to <twanvl@users.sourceforge.net>."
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-magicseteditor config.status 0.3.7b
-configured by $0, generated by GNU Autoconf 2.64,
-  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+magicseteditor config.status 0.3.9
+configured by $0, generated by GNU Autoconf 2.65,
+  with options \\"\$ac_cs_config\\"
 
 Copyright (C) 2009 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
@@ -6352,6 +6381,8 @@ do
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
     $as_echo "$ac_cs_version"; exit ;;
+  --config | --confi | --conf | --con | --co | --c )
+    $as_echo "$ac_cs_config"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
@@ -6539,7 +6570,7 @@ s/'"$ac_delim"'$//
 t delim
 :nl
 h
-s/\(.\{148\}\).*/\1/
+s/\(.\{148\}\)..*/\1/
 t more1
 s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
 p
@@ -6553,7 +6584,7 @@ s/.\{148\}//
 t nl
 :delim
 h
-s/\(.\{148\}\).*/\1/
+s/\(.\{148\}\)..*/\1/
 t more2
 s/["\\]/\\&/g; s/^/"/; s/$/"/
 p

configure.ac

@@ -6,7 +6,7 @@
 
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT(magicseteditor, 0.3.7b, twanvl@users.sourceforge.net)
+AC_INIT(magicseteditor, 0.3.9, twanvl@users.sourceforge.net)
 AC_CONFIG_SRCDIR([src/main.cpp])
 # TODO: Actually use the config header
 AC_CONFIG_HEADER([src/config.h])