From 81c6fb87cddba6386dacd43aa7193dd4ad801bff Mon Sep 17 00:00:00 2001
From: coppro <coppro@0fc631ac-6414-0410-93d0-97cfa31319b6>
Date: Wed, 20 Jan 2010 03:19:57 +0000
Subject: [PATCH] More updates to build system

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1435 0fc631ac-6414-0410-93d0-97cfa31319b6
---
 MakeAM.sh                     | 3 ++-
 Makefile.am                   | 3 ++-
 Makefile.in                   | 3 ++-
 configure                     | 1 -
 configure.ac                  | 1 -
 src/gui/control/item_list.cpp | 2 +-
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/MakeAM.sh b/MakeAM.sh
index 1a5c03f1..f478fc18 100755
--- a/MakeAM.sh
+++ b/MakeAM.sh
@@ -25,7 +25,7 @@ AM_LDFLAGS  = @WX_LIBS@ $(BOOST_LDFLAGS)
 	gcc -x c - -c -o $@ <<<""
 
 magicseteditor_LDADD = $(BOOST_REGEX_LIB)
-magicseteditor_CXXFLAGS = -fpch-deps $(AM_CXXFLAGS)
+magicseteditor_CXXFLAGS = $(AM_CXXFLAGS)
 magicseteditor_SOURCES = 
 
 if GLIBCPP_BUILD_PCH
@@ -34,6 +34,7 @@ clean-local:
 	rm -f ./src/util/prec.gch
 include ./src/util/$(DEPDIR)/prec.Pch
 magicseteditor_SOURCES += ./src/util/prec.gch
+magicseteditor_CXXFLAGS += -fpch-deps
 endif
 
 # The script used to generate is MakeAM.sh' > Makefile.am;
diff --git a/Makefile.am b/Makefile.am
index d0a2f751..485d69ef 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,7 +24,7 @@ AM_LDFLAGS  = @WX_LIBS@ $(BOOST_LDFLAGS)
 	gcc -x c - -c -o $@ <<<""
 
 magicseteditor_LDADD = $(BOOST_REGEX_LIB)
-magicseteditor_CXXFLAGS = -fpch-deps $(AM_CXXFLAGS)
+magicseteditor_CXXFLAGS = $(AM_CXXFLAGS)
 magicseteditor_SOURCES = 
 
 if GLIBCPP_BUILD_PCH
@@ -33,6 +33,7 @@ clean-local:
 	rm -f ./src/util/prec.gch
 include ./src/util/$(DEPDIR)/prec.Pch
 magicseteditor_SOURCES += ./src/util/prec.gch
+magicseteditor_CXXFLAGS += -fpch-deps
 endif
 
 # The script used to generate is MakeAM.sh
diff --git a/Makefile.in b/Makefile.in
index 3ab33c48..2a3146a4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -42,6 +42,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 bin_PROGRAMS = magicseteditor$(EXEEXT)
 @GLIBCPP_BUILD_PCH_TRUE@am__append_1 = ./src/util/prec.gch
+@GLIBCPP_BUILD_PCH_TRUE@am__append_2 = -fpch-deps
 subdir = .
 DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(top_srcdir)/configure \
@@ -471,7 +472,7 @@ AUTOMAKE_OPTIONS = subdir-objects
 AM_CXXFLAGS = @WX_CXXFLAGS@ $(BOOST_CXXFLAGS) -I. -Wall
 AM_LDFLAGS = @WX_LIBS@ $(BOOST_LDFLAGS)
 magicseteditor_LDADD = $(BOOST_REGEX_LIB)
-magicseteditor_CXXFLAGS = -fpch-deps $(AM_CXXFLAGS)
+magicseteditor_CXXFLAGS = $(AM_CXXFLAGS) $(am__append_2)
 
 # The script used to generate is MakeAM.sh
 magicseteditor_SOURCES = $(am__append_1) ./src/code_template.cpp \
diff --git a/configure b/configure
index 6eb27cce..c61d66f6 100755
--- a/configure
+++ b/configure
@@ -4637,7 +4637,6 @@ fi
     	LDFLAGS="$LDFLAGS_SAVED"
 	fi
 
-BOOST_REGEX_LIB="-Wl,-Bstatic $BOOST_REGEX_LIB -Wl,-Bdynamic"
 
 # Check for wxWidgets
 
diff --git a/configure.ac b/configure.ac
index f85ea677..e60572cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,7 +38,6 @@ AC_CHECK_LIB([hunspell],[Hunspell_create])
 # Check for Boost
 AX_BOOST_BASE([1.37.0])
 AX_BOOST_REGEX
-BOOST_REGEX_LIB="-Wl,-Bstatic $BOOST_REGEX_LIB -Wl,-Bdynamic"
 
 # Check for wxWidgets
 AM_OPTIONS_WXCONFIG
diff --git a/src/gui/control/item_list.cpp b/src/gui/control/item_list.cpp
index d0c66ab6..8339d9a5 100644
--- a/src/gui/control/item_list.cpp
+++ b/src/gui/control/item_list.cpp
@@ -154,7 +154,7 @@ void ItemList::refreshList(bool refresh_current_only) {
 	getItems(sorted_list);
 	// Sort the list
 	if (sort_by_column >= 0) {
-		sort(sorted_list.begin(), sorted_list.end(), ItemComparer(*this));
+		stable_sort(sorted_list.begin(), sorted_list.end(), ItemComparer(*this));
 	}
 	// Has the entire list changed?
 	if (refresh_current_only && sorted_list == old_sorted_list) {