Added configtool to configure and Makefile.in

Added -lsupc++ to end of LDLIBS to avoid link errors

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21152 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/utils/Makefile.in b/utils/Makefile.in
index d74f37219344b9f9b8edf51ab28345e822164859..ad184adf57f3e729b364193ddbbfbe8ca01e0100 100644 (file)
--- a/utils/Makefile.in
+++ b/utils/Makefile.in
@@ -2,7 +2,7 @@
 # Makefile : Builds wxWindows utils for Unix.
 #
 
-UTILS_SUBDIRS=tex2rtf hhp2cached makegen HelpGen dialoged helpview
+UTILS_SUBDIRS=tex2rtf hhp2cached makegen HelpGen dialoged helpview configtool
 
 all:
        @for d in $(UTILS_SUBDIRS); do (cd $$d && $(MAKE)); done

diff --git a/utils/configtool/src/Makefile b/utils/configtool/src/Makefile
index b189631ffdcf1ae3645369fb25bd52fa91343eeb..65483082d05b3ca68242971483d1c28ee2fc7b5d 100644 (file)
--- a/utils/configtool/src/Makefile
+++ b/utils/configtool/src/Makefile
@@ -127,6 +127,11 @@ else
 include $(top_builddir)/src/makeprog.env
 endif
 
+# Need to place -lsupc++ at end of libs or we get
+# link errors. Note the := syntax to prevent a
+# recursive variable error.
+LDLIBS:=${LDLIBS} -lsupc++
+
 # Only omit C++ libs for economy of size on Unix
 ifeq "$(WXTOOLKIT)" "msw"
 CC=c++

diff --git a/utils/configure b/utils/configure
index a85526b8190232b672c6350bdfd45797844274d8..1c8fe9c402875fcd8812e9a67438a048807bbdf7 100755 (executable)
--- a/utils/configure
+++ b/utils/configure
@@ -660,6 +660,8 @@ trap 'rm -fr `echo "
             emulator/src/Makefile
             helpview/Makefile
             helpview/src/Makefile
+            wxconfigtool/Makefile
+            wxconfigtool/src/Makefile
          " | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
@@ -749,6 +751,8 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile
             emulator/src/Makefile
             helpview/Makefile
             helpview/src/Makefile
+            configtool/Makefile
+            configtool/src/Makefile
          "}
 EOF
 cat >> $CONFIG_STATUS <<\EOF

diff --git a/utils/configure.in b/utils/configure.in
index 39a4a5f333b5b1e5724e6fa2cca5e1a2e6f3db9d..165039beda2b74e1b0c675a5338daf3fd9b99099 100644 (file)
--- a/utils/configure.in
+++ b/utils/configure.in
@@ -30,4 +30,6 @@ AC_OUTPUT([
             emulator/src/Makefile
             helpview/Makefile
             helpview/src/Makefile
+            wxconfigtool/Makefile
+            wxconfigtool/src/Makefile
          ])