Menu
▾
▴
[wxdevcenter-commits] SF.net SVN: wxdevcenter:[62] trunk/wxdevcenter
|
From: <cur...@us...> - 2009-12-15 17:50:56
|
Revision: 62
http://wxdevcenter.svn.sourceforge.net/wxdevcenter/?rev=62&view=rev
Author: cursorstar
Date: 2009-12-15 17:50:46 +0000 (Tue, 15 Dec 2009)
Log Message:
-----------
Add module 'uistd' with all standard UI.
Add module 'widgets' with exported (independant lib) widget classes.
Move Scintilla classes to widgets lib.
Modified Paths:
--------------
trunk/wxdevcenter/Makefile.in
trunk/wxdevcenter/aclocal.m4
trunk/wxdevcenter/configure
trunk/wxdevcenter/configure.ac
trunk/wxdevcenter/ltmain.sh
trunk/wxdevcenter/plugins/Makefile.am
trunk/wxdevcenter/plugins/Makefile.in
trunk/wxdevcenter/plugins/bitmap/Makefile.in
trunk/wxdevcenter/plugins/text/Makefile.am
trunk/wxdevcenter/plugins/text/Makefile.in
trunk/wxdevcenter/plugins/text/editctrl.cpp
trunk/wxdevcenter/plugins/text/editctrl.hpp
trunk/wxdevcenter/plugins/text/prefs.hpp
trunk/wxdevcenter/plugins/text/text-search.cpp
trunk/wxdevcenter/plugins/text/text.cpp
trunk/wxdevcenter/plugins/text/view.cpp
trunk/wxdevcenter/plugins/text/view.hpp
trunk/wxdevcenter/po/Makefile.in.in
trunk/wxdevcenter/share/Makefile.in
trunk/wxdevcenter/share/xrc/Makefile.in
trunk/wxdevcenter/src/Makefile.am
trunk/wxdevcenter/src/Makefile.in
trunk/wxdevcenter/src/docview/Makefile.in
trunk/wxdevcenter/src/docview/document.cpp
trunk/wxdevcenter/src/docview/document.hpp
trunk/wxdevcenter/src/docview/view.cpp
trunk/wxdevcenter/src/sys/Makefile.in
trunk/wxdevcenter/src/sys/action.cpp
trunk/wxdevcenter/src/sys/action.hpp
trunk/wxdevcenter/src/sys/search.cpp
trunk/wxdevcenter/src/sys/task.cpp
trunk/wxdevcenter/src/sys/task.hpp
trunk/wxdevcenter/src/tools/Makefile.in
trunk/wxdevcenter/src/ui/Makefile.in
trunk/wxdevcenter/src/ui/dialog/Makefile.in
trunk/wxdevcenter/src/ui/frame.cpp
trunk/wxdevcenter/src/ui/frame.hpp
trunk/wxdevcenter/src/ui/perspective.cpp
trunk/wxdevcenter/src/ui/perspective.hpp
trunk/wxdevcenter/src/ui/workbar.cpp
trunk/wxdevcenter/src/ui/workbar.hpp
Added Paths:
-----------
trunk/wxdevcenter/src/uistd/
trunk/wxdevcenter/src/uistd/Makefile.am
trunk/wxdevcenter/src/uistd/Makefile.in
trunk/wxdevcenter/src/uistd/fsworkbar.cpp
trunk/wxdevcenter/src/uistd/fsworkbar.hpp
trunk/wxdevcenter/src/uistd/stdconfig.cpp
trunk/wxdevcenter/src/uistd/stdconfig.hpp
trunk/wxdevcenter/src/uistd/stdframe.cpp
trunk/wxdevcenter/src/uistd/stdframe.hpp
trunk/wxdevcenter/src/widgets/
trunk/wxdevcenter/src/widgets/Makefile.am
trunk/wxdevcenter/src/widgets/Makefile.in
trunk/wxdevcenter/src/widgets/markbar.cpp
trunk/wxdevcenter/src/widgets/markbar.hpp
trunk/wxdevcenter/src/widgets/wxscintilla/
trunk/wxdevcenter/src/widgets/wxscintilla/Makefile.am
trunk/wxdevcenter/src/widgets/wxscintilla/Makefile.in
trunk/wxdevcenter/src/widgets/wxscintilla/PlatWX.cpp
trunk/wxdevcenter/src/widgets/wxscintilla/PlatWX.h
trunk/wxdevcenter/src/widgets/wxscintilla/README.txt
trunk/wxdevcenter/src/widgets/wxscintilla/ScintillaWX.cpp
trunk/wxdevcenter/src/widgets/wxscintilla/ScintillaWX.h
trunk/wxdevcenter/src/widgets/wxscintilla/gen_iface.py
trunk/wxdevcenter/src/widgets/wxscintilla/private.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/include/
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/include/Accessor.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/include/Face.py
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/include/HFacer.py
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/include/KeyWords.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/include/Platform.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/include/PropSet.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/include/SciLexer.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/include/Scintilla.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/include/Scintilla.iface
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/include/ScintillaWidget.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/include/WindowAccessor.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/AutoComplete.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/AutoComplete.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/CallTip.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/CallTip.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/CellBuffer.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/CellBuffer.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/CharClassify.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/CharClassify.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/CharacterSet.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/ContractionState.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/ContractionState.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/Decoration.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/Decoration.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/Document.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/Document.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/DocumentAccessor.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/DocumentAccessor.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/Editor.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/Editor.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/ExternalLexer.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/ExternalLexer.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/Indicator.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/Indicator.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/KeyMap.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/KeyMap.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/KeyWords.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexAPDL.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexASY.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexAU3.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexAVE.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexAbaqus.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexAda.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexAsm.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexAsn1.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexBaan.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexBash.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexBasic.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexBullant.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexCLW.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexCOBOL.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexCPP.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexCSS.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexCaml.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexCmake.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexConf.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexCrontab.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexCsound.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexD.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexEScript.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexEiffel.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexErlang.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexFlagship.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexForth.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexFortran.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexGAP.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexGen.py
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexGui4Cli.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexHTML.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexHaskell.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexInno.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexKix.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexLisp.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexLout.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexLua.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexMMIXAL.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexMPT.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexMSSQL.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexMagik.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexMatlab.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexMetapost.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexMySQL.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexNimrod.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexNsis.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexOpal.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexOthers.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexPB.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexPLM.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexPOV.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexPS.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexPascal.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexPerl.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexPowerPro.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexPowerShell.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexProgress.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexPython.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexR.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexRebol.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexRuby.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexSML.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexSQL.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexScriptol.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexSmalltalk.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexSorcus.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexSpecman.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexSpice.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexTACL.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexTADS3.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexTAL.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexTCL.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexTeX.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexVB.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexVHDL.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexVerilog.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexYAML.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LineMarker.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LineMarker.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/Partitioning.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/PerLine.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/PerLine.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/PositionCache.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/PositionCache.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/PropSet.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/PropSetSimple.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/RESearch.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/RESearch.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/RunStyles.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/RunStyles.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/SVector.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/SciTE.properties
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/ScintillaBase.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/ScintillaBase.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/Selection.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/Selection.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/SplitVector.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/Style.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/Style.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/StyleContext.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/StyleContext.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/UniConversion.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/UniConversion.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/ViewStyle.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/ViewStyle.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/WindowAccessor.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/XPM.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/XPM.h
trunk/wxdevcenter/src/widgets/wxscintilla/wxscintilla.cpp
trunk/wxdevcenter/src/widgets/wxscintilla/wxscintilla.cpp.in
trunk/wxdevcenter/src/widgets/wxscintilla/wxscintilla.h
trunk/wxdevcenter/src/widgets/wxscintilla/wxscintilla.h.in
Removed Paths:
-------------
trunk/wxdevcenter/plugins/text/scintilla/
trunk/wxdevcenter/plugins/uistd/
Modified: trunk/wxdevcenter/Makefile.in
===================================================================
--- trunk/wxdevcenter/Makefile.in 2009-12-05 12:46:52 UTC (rev 61)
+++ trunk/wxdevcenter/Makefile.in 2009-12-15 17:50:46 UTC (rev 62)
@@ -123,29 +123,10 @@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
Modified: trunk/wxdevcenter/aclocal.m4
===================================================================
--- trunk/wxdevcenter/aclocal.m4 2009-12-05 12:46:52 UTC (rev 61)
+++ trunk/wxdevcenter/aclocal.m4 2009-12-15 17:50:46 UTC (rev 62)
@@ -506,25 +506,25 @@
INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-AC_SUBST(INTLTOOL_DESKTOP_RULE)
-AC_SUBST(INTLTOOL_DIRECTORY_RULE)
-AC_SUBST(INTLTOOL_KEYS_RULE)
-AC_SUBST(INTLTOOL_PROP_RULE)
-AC_SUBST(INTLTOOL_OAF_RULE)
-AC_SUBST(INTLTOOL_PONG_RULE)
-AC_SUBST(INTLTOOL_SERVER_RULE)
-AC_SUBST(INTLTOOL_SHEET_RULE)
-AC_SUBST(INTLTOOL_SOUNDLIST_RULE)
-AC_SUBST(INTLTOOL_UI_RULE)
-AC_SUBST(INTLTOOL_XAM_RULE)
-AC_SUBST(INTLTOOL_KBD_RULE)
-AC_SUBST(INTLTOOL_XML_RULE)
-AC_SUBST(INTLTOOL_XML_NOMERGE_RULE)
-AC_SUBST(INTLTOOL_CAVES_RULE)
-AC_SUBST(INTLTOOL_SCHEMAS_RULE)
-AC_SUBST(INTLTOOL_THEME_RULE)
-AC_SUBST(INTLTOOL_SERVICE_RULE)
-AC_SUBST(INTLTOOL_POLICY_RULE)
+_IT_SUBST(INTLTOOL_DESKTOP_RULE)
+_IT_SUBST(INTLTOOL_DIRECTORY_RULE)
+_IT_SUBST(INTLTOOL_KEYS_RULE)
+_IT_SUBST(INTLTOOL_PROP_RULE)
+_IT_SUBST(INTLTOOL_OAF_RULE)
+_IT_SUBST(INTLTOOL_PONG_RULE)
+_IT_SUBST(INTLTOOL_SERVER_RULE)
+_IT_SUBST(INTLTOOL_SHEET_RULE)
+_IT_SUBST(INTLTOOL_SOUNDLIST_RULE)
+_IT_SUBST(INTLTOOL_UI_RULE)
+_IT_SUBST(INTLTOOL_XAM_RULE)
+_IT_SUBST(INTLTOOL_KBD_RULE)
+_IT_SUBST(INTLTOOL_XML_RULE)
+_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE)
+_IT_SUBST(INTLTOOL_CAVES_RULE)
+_IT_SUBST(INTLTOOL_SCHEMAS_RULE)
+_IT_SUBST(INTLTOOL_THEME_RULE)
+_IT_SUBST(INTLTOOL_SERVICE_RULE)
+_IT_SUBST(INTLTOOL_POLICY_RULE)
# Check the gettext tools to make sure they are GNU
AC_PATH_PROG(XGETTEXT, xgettext)
@@ -541,12 +541,17 @@
AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
fi
-AC_PATH_PROG(INTLTOOL_PERL, [perl])
+AC_PATH_PROG(INTLTOOL_PERL, perl)
if test -z "$INTLTOOL_PERL"; then
- AC_MSG_ERROR([perl not found; required for intltool])
+ AC_MSG_ERROR([perl not found])
fi
-if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
- AC_MSG_ERROR([perl 5.x required for intltool])
+AC_MSG_CHECKING([for perl >= 5.8.1])
+$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
+if test $? -ne 0; then
+ AC_MSG_ERROR([perl 5.8.1 is required for intltool])
+else
+ IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
+ AC_MSG_RESULT([$IT_PERL_VERSION])
fi
if test "x$2" != "xno-xml"; then
AC_MSG_CHECKING([for XML::Parser])
@@ -602,7 +607,7 @@
dnl of config.status.
AC_CONFIG_COMMANDS_PRE([
AC_CONFIG_COMMANDS([$1/stamp-it], [
- if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" ]; then
+ if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then
AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.])
fi
rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
@@ -624,6 +629,17 @@
])dnl
])
+# _IT_SUBST(VARIABLE)
+# -------------------
+# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
+#
+AC_DEFUN([_IT_SUBST],
+[
+AC_SUBST([$1])
+m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
+]
+)
+
# deprecated macros
AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
# A hint is needed for aclocal from Automake <= 1.9.4:
@@ -2927,14 +2943,7 @@
*) objformat=elf ;;
esac
fi
- # Handle Gentoo/FreeBSD as it was Linux
- case $host_vendor in
- gentoo)
- version_type=linux ;;
- *)
- version_type=freebsd-$objformat ;;
- esac
-
+ version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
@@ -2945,12 +2954,6 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
need_version=yes
;;
- linux)
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- need_lib_prefix=no
- need_version=no
- ;;
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
@@ -3124,6 +3127,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
+netbsdelf*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ dynamic_linker='NetBSD ld.elf_so'
+ ;;
+
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -3715,7 +3730,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-netbsd*)
+netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
@@ -4396,7 +4411,7 @@
;;
esac
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -4821,6 +4836,9 @@
cygwin* | mingw* | cegcc*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
;;
+ linux* | k*bsd*-gnu)
+ _LT_TAGVAR(link_all_deplibs, $1)=no
+ ;;
*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -5067,7 +5085,7 @@
fi
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -5242,6 +5260,7 @@
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
+ _LT_TAGVAR(link_all_deplibs, $1)=no
else
# not using gcc
if test "$host_cpu" = ia64; then
@@ -5480,7 +5499,7 @@
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
@@ -8689,14 +8708,16 @@
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
# ---------------------------------------------
m4_define([_PKG_CONFIG],
-[if test -n "$$1"; then
- pkg_cv_[]$1="$$1"
- elif test -n "$PKG_CONFIG"; then
- PKG_CHECK_EXISTS([$3],
- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
- [pkg_failed=yes])
- else
- pkg_failed=untried
+[if test -n "$PKG_CONFIG"; then
+ if test -n "$$1"; then
+ pkg_cv_[]$1="$$1"
+ else
+ PKG_CHECK_EXISTS([$3],
+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+ [pkg_failed=yes])
+ fi
+else
+ pkg_failed=untried
fi[]dnl
])# _PKG_CONFIG
@@ -8740,9 +8761,9 @@
if test $pkg_failed = yes; then
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
else
- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
fi
# Put the nasty error message in config.log where it belongs
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
@@ -9091,59 +9112,61 @@
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-#serial 4
+#serial 5
# _AM_OUTPUT_DEPENDENCY_COMMANDS
# ------------------------------
AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[# Autoconf 2.62 quotes --file arguments for eval, but not when files
-# are listed without --file. Let's play safe and only enable the eval
-# if we detect the quoting.
-case $CONFIG_FILES in
-*\'*) eval set x "$CONFIG_FILES" ;;
-*) set x $CONFIG_FILES ;;
-esac
-shift
-for mf
-do
- # Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named `Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
- # limit of 2048, but all sed's we know have understand at least 4000.
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
- dirpart=`AS_DIRNAME("$mf")`
- else
- continue
- fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running `make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n 's/^U = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`AS_DIRNAME(["$file"])`
- AS_MKDIR_P([$dirpart/$fdir])
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
+[{
+ # Autoconf 2.62 quotes --file arguments for eval, but not when files
+ # are listed without --file. Let's play safe and only enable the eval
+ # if we detect the quoting.
+ case $CONFIG_FILES in
+ *\'*) eval set x "$CONFIG_FILES" ;;
+ *) set x $CONFIG_FILES ;;
+ esac
+ shift
+ for mf
+ do
+ # Strip MF so we end up with the name of the file.
+ mf=`echo "$mf" | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile or not.
+ # We used to match only the files named `Makefile.in', but
+ # some people rename them; so instead we look at the file content.
+ # Grep'ing the first line is not enough: some people post-process
+ # each Makefile.in and add a new line on top of each file to say so.
+ # Grep'ing the whole file is not good either: AIX grep has a line
+ # limit of 2048, but all sed's we know have understand at least 4000.
+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+ dirpart=`AS_DIRNAME("$mf")`
+ else
+ continue
+ fi
+ # Extract the definition of DEPDIR, am__include, and am__quote
+ # from the Makefile without running `make'.
+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+ test -z "$DEPDIR" && continue
+ am__include=`sed -n 's/^am__include = //p' < "$mf"`
+ test -z "am__include" && continue
+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+ # When using ansi2knr, U may be empty or an underscore; expand it
+ U=`sed -n 's/^U = //p' < "$mf"`
+ # Find all dependency output files, they are included files with
+ # $(DEPDIR) in their names. We invoke sed twice because it is the
+ # simplest approach to changing $(DEPDIR) to its actual value in the
+ # expansion.
+ for file in `sed -n "
+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+ # Make sure the directory exists.
+ test -f "$dirpart/$file" && continue
+ fdir=`AS_DIRNAME(["$file"])`
+ AS_MKDIR_P([$dirpart/$fdir])
+ # echo "creating $dirpart/$file"
+ echo '# dummy' > "$dirpart/$file"
+ done
done
-done
+}
])# _AM_OUTPUT_DEPENDENCY_COMMANDS
Modified: trunk/wxdevcenter/configure
===================================================================
--- trunk/wxdevcenter/configure 2009-12-05 12:46:52 UTC (rev 61)
+++ trunk/wxdevcenter/configure 2009-12-15 17:50:46 UTC (rev 62)
@@ -5960,7 +5960,7 @@
$as_echo "$as_me: error: wxWidgets is required. Try --with-wx-config." >&2;}
{ (exit 1); exit 1; }; }
fi
-WXLIBS="xrc,stc,aui,html,qa,adv,core,xml,net,base"
+WXLIBS="xrc,aui,html,qa,adv,core,xml,net,base"
WX_CPPFLAGS="`$WXCONFIG --cppflags $WXLIBS`"
WX_CXXFLAGS="`$WXCONFIG --cxxflags $WXLIBS`"
WX_LIBS="`$WXCONFIG --libs $WXLIBS`"
@@ -8560,6 +8560,82 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
# Check the gettext tools to make sure they are GNU
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2
@@ -8777,14 +8853,21 @@
if test -z "$INTLTOOL_PERL"; then
- { { $as_echo "$as_me:$LINENO: error: perl not found; required for intltool" >&5
-$as_echo "$as_me: error: perl not found; required for intltool" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: perl not found" >&5
+$as_echo "$as_me: error: perl not found" >&2;}
{ (exit 1); exit 1; }; }
fi
-if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
- { { $as_echo "$as_me:$LINENO: error: perl 5.x required for intltool" >&5
-$as_echo "$as_me: error: perl 5.x required for intltool" >&2;}
+{ $as_echo "$as_me:$LINENO: checking for perl >= 5.8.1" >&5
+$as_echo_n "checking for perl >= 5.8.1... " >&6; }
+$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
+if test $? -ne 0; then
+ { { $as_echo "$as_me:$LINENO: error: perl 5.8.1 is required for intltool" >&5
+$as_echo "$as_me: error: perl 5.8.1 is required for intltool" >&2;}
{ (exit 1); exit 1; }; }
+else
+ IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
+ { $as_echo "$as_me:$LINENO: result: $IT_PERL_VERSION" >&5
+$as_echo "$IT_PERL_VERSION" >&6; }
fi
if test "x" != "xno-xml"; then
{ $as_echo "$as_me:$LINENO: checking for XML::Parser" >&5
@@ -9527,13 +9610,13 @@
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:9530: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:9613: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:9533: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:9616: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:9536: output\"" >&5)
+ (eval echo "\"\$as_me:9619: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -10003,7 +10086,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-netbsd*)
+netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
@@ -10738,7 +10821,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 10741 "configure"' > conftest.$ac_ext
+ echo '#line 10824 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -12822,11 +12905,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12825: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12908: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:12829: \$? = $ac_status" >&5
+ echo "$as_me:12912: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13161,11 +13244,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13164: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13247: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13168: \$? = $ac_status" >&5
+ echo "$as_me:13251: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13266,11 +13349,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13269: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13352: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13273: \$? = $ac_status" >&5
+ echo "$as_me:13356: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -13321,11 +13404,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13324: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13407: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13328: \$? = $ac_status" >&5
+ echo "$as_me:13411: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -13622,7 +13705,7 @@
fi
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -13797,6 +13880,7 @@
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
+ link_all_deplibs=no
else
# not using gcc
if test "$host_cpu" = ia64; then
@@ -14211,7 +14295,7 @@
link_all_deplibs=yes
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
@@ -14957,14 +15041,7 @@
*) objformat=elf ;;
esac
fi
- # Handle Gentoo/FreeBSD as it was Linux
- case $host_vendor in
- gentoo)
- version_type=linux ;;
- *)
- version_type=freebsd-$objformat ;;
- esac
-
+ version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
@@ -14975,12 +15052,6 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
need_version=yes
;;
- linux)
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- need_lib_prefix=no
- need_version=no
- ;;
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
@@ -15201,6 +15272,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
+netbsdelf*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ dynamic_linker='NetBSD ld.elf_so'
+ ;;
+
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -16134,7 +16217,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 16137 "configure"
+#line 16220 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -16230,7 +16313,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 16233 "configure"
+#line 16316 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -18126,7 +18209,7 @@
;;
esac
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -18250,11 +18333,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18253: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18336: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18257: \$? = $ac_status" >&5
+ echo "$as_me:18340: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -18349,11 +18432,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18352: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18435: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:18356: \$? = $ac_status" >&5
+ echo "$as_me:18439: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -18401,11 +18484,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18404: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18487: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:18408: \$? = $ac_status" >&5
+ echo "$as_me:18491: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -18477,6 +18560,9 @@
cygwin* | mingw* | cegcc*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
;;
+ linux* | k*bsd*-gnu)
+ link_all_deplibs_CXX=no
+ ;;
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -18832,14 +18918,7 @@
*) objformat=elf ;;
esac
fi
- # Handle Gentoo/FreeBSD as it was Linux
- case $host_vendor in
- gentoo)
- version_type=linux ;;
- *)
- version_type=freebsd-$objformat ;;
- esac
-
+ version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
@@ -18850,12 +18929,6 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
need_version=yes
;;
- linux)
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- need_lib_prefix=no
- need_version=no
- ;;
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
@@ -19076,6 +19149,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
+netbsdelf*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ dynamic_linker='NetBSD ld.elf_so'
+ ;;
+
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -19522,10 +19607,11 @@
{ $as_echo "$as_me:$LINENO: checking for WXDEVCENTER" >&5
$as_echo_n "checking for WXDEVCENTER... " >&6; }
-if test -n "$WXDEVCENTER_CFLAGS"; then
- pkg_cv_WXDEVCENTER_CFLAGS="$WXDEVCENTER_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
+if test -n "$PKG_CONFIG"; then
+ if test -n "$WXDEVCENTER_CFLAGS"; then
+ pkg_cv_WXDEVCENTER_CFLAGS="$WXDEVCENTER_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 libglade-2.0 \"") >&5
($PKG_CONFIG --exists --print-errors "gtk+-2.0 libglade-2.0 ") 2>&5
ac_status=$?
@@ -19535,13 +19621,15 @@
else
pkg_failed=yes
fi
- else
- pkg_failed=untried
+ fi
+else
+ pkg_failed=untried
fi
-if test -n "$WXDEVCENTER_LIBS"; then
- pkg_cv_WXDEVCENTER_LIBS="$WXDEVCENTER_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
+if test -n "$PKG_CONFIG"; then
+ if test -n "$WXDEVCENTER_LIBS"; then
+ pkg_cv_WXDEVCENTER_LIBS="$WXDEVCENTER_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 libglade-2.0 \"") >&5
($PKG_CONFIG --exists --print-errors "gtk+-2.0 libglade-2.0 ") 2>&5
ac_status=$?
@@ -19551,8 +19639,9 @@
else
pkg_failed=yes
fi
- else
- pkg_failed=untried
+ fi
+else
+ pkg_failed=untried
fi
@@ -19565,9 +19654,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- WXDEVCENTER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0 libglade-2.0 " 2>&1`
+ WXDEVCENTER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 libglade-2.0 "`
else
- WXDEVCENTER_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0 libglade-2.0 " 2>&1`
+ WXDEVCENTER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 libglade-2.0 "`
fi
# Put the nasty error message in config.log where it belongs
echo "$WXDEVCENTER_PKG_ERRORS" >&5
@@ -19638,7 +19727,7 @@
-ac_config_files="$ac_config_files Makefile src/Makefile src/ui/Makefile src/ui/dialog/Makefile src/sys/Makefile src/docview/Makefile src/tools/Makefile share/Makefile share/xrc/Makefile po/Makefile.in plugins/Makefile plugins/text/Makefile plugins/bitmap/Makefile plugins/uistd/Makefile"
+ac_config_files="$ac_config_files Makefile src/Makefile src/docview/Makefile src/sys/Makefile src/tools/Makefile src/ui/Makefile src/ui/dialog/Makefile src/uistd/Makefile src/widgets/Makefile src/widgets/wxscintilla/Makefile plugins/Makefile plugins/text/Makefile plugins/bitmap/Makefile share/Makefile share/xrc/Makefile po/Makefile.in"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -20656,18 +20745,20 @@
"libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
+ "src/docview/Makefile") CONFIG_FILES="$CONFIG_FILES src/docview/Makefile" ;;
+ "src/sys/Makefile") CONFIG_FILES="$CONFIG_FILES src/sys/Makefile" ;;
+ "src/tools/Makefile") CONFIG_FILES="$CONFIG_FILES src/tools/Makefile" ;;
"src/ui/Makefile") CONFIG_FILES="$CONFIG_FILES src/ui/Makefile" ;;
"src/ui/dialog/Makefile") CONFIG_FILES="$CONFIG_FILES src/ui/dialog/Makefile" ;;
- "src/sys/Makefile") CONFIG_FILES="$CONFIG_FILES src/sys/Makefile" ;;
- "src/docview/Makefile") CONFIG_FILES="$CONFIG_FILES src/docview/Makefile" ;;
- "src/tools/Makefile") CONFIG_FILES="$CONFIG_FILES src/tools/Makefile" ;;
+ "src/uistd/Makefile") CONFIG_FILES="$CONFIG_FILES src/uistd/Makefile" ;;
+ "src/widgets/Makefile") CONFIG_FILES="$CONFIG_FILES src/widgets/Makefile" ;;
+ "src/widgets/wxscintilla/Makefile") CONFIG_FILES="$CONFIG_FILES src/widgets/wxscintilla/Makefile" ;;
+ "plugins/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/Makefile" ;;
+ "plugins/text/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/text/Makefile" ;;
+ "plugins/bitmap/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/bitmap/Makefile" ;;
"share/Makefile") CONFIG_FILES="$CONFIG_FILES share/Makefile" ;;
"share/xrc/Makefile") CONFIG_FILES="$CONFIG_FILES share/xrc/Makefile" ;;
"po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
- "plugins/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/Makefile" ;;
- "plugins/text/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/text/Makefile" ;;
- "plugins/bitmap/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/bitmap/Makefile" ;;
- "plugins/uistd/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/uistd/Makefile" ;;
"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
*) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
@@ -21324,27 +21415,28 @@
case $ac_file$ac_mode in
- "depfiles":C) test x"$AMDEP_TRUE" != x"" || # Autoconf 2.62 quotes --file arguments for eval, but not when files
-# are listed without --file. Let's play safe and only enable the eval
-# if we detect the quoting.
-case $CONFIG_FILES in
-*\'*) eval set x "$CONFIG_FILES" ;;
-*) set x $CONFIG_FILES ;;
-esac
-shift
-for mf
-do
- # Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named `Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
- # limit of 2048, but all sed's we know have understand at least 4000.
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
- dirpart=`$as_dirname -- "$mf" ||
+ "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
+ # Autoconf 2.62 quotes --file arguments for eval, but not when files
+ # are listed without --file. Let's play safe and only enable the eval
+ # if we detect the quoting.
+ case $CONFIG_FILES in
+ *\'*) eval set x "$CONFIG_FILES" ;;
+ *) set x $CONFIG_FILES ;;
+ esac
+ shift
+ for mf
+ do
+ # Strip MF so we end up with the name of the file.
+ mf=`echo "$mf" | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile or not.
+ # We used to match only the files named `Makefile.in', but
+ # some people rename them; so instead we look at the file content.
+ # Grep'ing the first line is not enough: some people post-process
+ # each Makefile.in and add a new line on top of each file to say so.
+ # Grep'ing the whole file is not good either: AIX grep has a line
+ # limit of 2048, but all sed's we know have understand at least 4000.
+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+ dirpart=`$as_dirname -- "$mf" ||
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$mf" : 'X\(//\)[^/]' \| \
X"$mf" : 'X\(//\)$' \| \
@@ -21367,28 +21459,28 @@
q
}
s/.*/./; q'`
- else
- continue
- fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running `make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n 's/^U = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`$as_dirname -- "$file" ||
+ else
+ continue
+ fi
+ # Extract the definition of DEPDIR, am__include, and am__quote
+ # from the Makefile without running `make'.
+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+ test -z "$DEPDIR" && continue
+ am__include=`sed -n 's/^am__include = //p' < "$mf"`
+ test -z "am__include" && continue
+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+ # When using ansi2knr, U may be empty or an underscore; expand it
+ U=`sed -n 's/^U = //p' < "$mf"`
+ # Find all dependency output files, they are included files with
+ # $(DEPDIR) in their names. We invoke sed twice because it is the
+ # simplest approach to changing $(DEPDIR) to its actual value in the
+ # expansion.
+ for file in `sed -n "
+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+ # Make sure the directory exists.
+ test -f "$dirpart/$file" && continue
+ fdir=`$as_dirname -- "$file" ||
$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$file" : 'X\(//\)[^/]' \| \
X"$file" : 'X\(//\)$' \| \
@@ -21411,7 +21503,7 @@
q
}
s/.*/./; q'`
- { as_dir=$dirpart/$fdir
+ { as_dir=$dirpart/$fdir
case $as_dir in #(
-*) as_dir=./$as_dir;;
esac
@@ -21452,10 +21544,11 @@
} || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
{ (exit 1); exit 1; }; }; }
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
+ # echo "creating $dirpart/$file"
+ echo '# dummy' > "$dirpart/$file"
+ done
done
-done
+}
;;
"default-1":C) case "$CONFIG_FILES" in *po/Makefile.in*)
sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
@@ -22263,7 +22356,7 @@
;;
"po/stamp-it":C)
- if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" ; then
+ if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
{ { $as_echo "$as_me:$LINENO: error: po/Makefile.in.in was not created by intltoolize." >&5
$as_echo "$as_me: error: po/Makefile.in.in was not created by intltoolize." >&2;}
{ (exit 1); exit 1; }; }
Modified: trunk/wxdevcenter/configure.ac
===================================================================
--- trunk/wxdevcenter/configure.ac 2009-12-05 12:46:52 UTC (rev 61)
+++ trunk/wxdevcenter/configure.ac 2009-12-15 17:50:46 UTC (rev 62)
@@ -29,7 +29,7 @@
AC_MSG_RESULT([not found])
AC_MSG_ERROR([wxWidgets is required. Try --with-wx-config.])
fi
-WXLIBS="xrc,stc,aui,html,qa,adv,core,xml,net,base"
+WXLIBS="xrc,aui,html,qa,adv,core,xml,net,base"
WX_CPPFLAGS="`$WXCONFIG --cppflags $WXLIBS`"
WX_CXXFLAGS="`$WXCONFIG --cxxflags $WXLIBS`"
WX_LIBS="`$WXCONFIG --libs $WXLIBS`"
@@ -76,16 +76,18 @@
AC_OUTPUT([
Makefile
src/Makefile
+src/docview/Makefile
+src/sys/Makefile
+src/tools/Makefile
src/ui/Makefile
src/ui/dialog/Makefile
-src/sys/Makefile
-src/docview/Makefile
-src/tools/Makefile
+src/uistd/Makefile
+src/widgets/Makefile
+src/widgets/wxscintilla/Makefile
+plugins/Makefile
+plugins/text/Makefile
+plugins/bitmap/Makefile
share/Makefile
share/xrc/Makefile
po/Makefile.in
-plugins/Makefile
-plugins/text/Makefile
-plugins/bitmap/Makefile
-plugins/uistd/Makefile
])
Modified: trunk/wxdevcenter/ltmain.sh
===================================================================
--- trunk/wxdevcenter/ltmain.sh 2009-12-05 12:46:52 UTC (rev 61)
+++ trunk/wxdevcenter/ltmain.sh 2009-12-15 17:50:46 UTC (rev 62)
@@ -65,7 +65,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
# linker: $LD (gnu? $with_gnu_ld)
-# $progname: (GNU libtool) 2.2.6
+# $progname: (GNU libtool) 2.2.6 Debian-2.2.6a-1ubuntu1
# automake: $automake_version
# autoconf: $autoconf_version
#
@@ -73,7 +73,7 @@
PROGRAM=ltmain.sh
PACKAGE=libtool
-VERSION=2.2.6
+VERSION="2.2.6 Debian-2.2.6a-1ubuntu1"
TIMESTAMP=""
package_revision=1.3012
@@ -116,15 +116,15 @@
: ${CP="cp -f"}
: ${ECHO="echo"}
-: ${EGREP="/usr/bin/grep -E"}
-: ${FGREP="/usr/bin/grep -F"}
-: ${GREP="/usr/bin/grep"}
+: ${EGREP="/bin/grep -E"}
+: ${FGREP="/bin/grep -F"}
+: ${GREP="/bin/grep"}
: ${LN_S="ln -s"}
: ${MAKE="make"}
: ${MKDIR="mkdir"}
: ${MV="mv -f"}
: ${RM="rm -f"}
-: ${SED="/opt/local/bin/gsed"}
+: ${SED="/bin/sed"}
: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
: ${Xsed="$SED -e 1s/^X//"}
@@ -5033,7 +5033,10 @@
case $pass in
dlopen) libs="$dlfiles" ;;
dlpreopen) libs="$dlprefiles" ;;
- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
+ link)
+ libs="$deplibs %DEPLIBS%"
+ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
+ ;;
esac
fi
if test "$linkmode,$pass" = "lib,dlpreopen"; then
@@ -6206,6 +6209,9 @@
revision="$number_minor"
lt_irix_increment=no
;;
+ *)
+ func_fatal_configuration "$modename: unknown library version type \`$version_type'"
+ ;;
esac
;;
no)
Modified: trunk/wxdevcenter/plugins/Makefile.am
===================================================================
--- trunk/wxdevcenter/plugins/Makefile.am 2009-12-05 12:46:52 UTC (rev 61)
+++ trunk/wxdevcenter/plugins/Makefile.am 2009-12-15 17:50:46 UTC (rev 62)
@@ -1,4 +1,4 @@
## File created by the gnome-build tools
-SUBDIRS = text bitmap uistd
+SUBDIRS = text bitmap
Modified: trunk/wxdevcenter/plugins/Makefile.in
===================================================================
--- trunk/wxdevcenter/plugins/Makefile.in 2009-12-05 12:46:52 UTC (rev 61)
+++ trunk/wxdevcenter/plugins/Makefile.in 2009-12-15 17:50:46 UTC (rev 62)
@@ -97,29 +97,10 @@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
@@ -221,7 +202,7 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-SUBDIRS = text bitmap uistd
+SUBDIRS = text bitmap
all: all-recursive
.SUFFIXES:
Modified: trunk/wxdevcenter/plugins/bitmap/Makefile.in
===================================================================
--- trunk/wxdevcenter/plugins/bitmap/Makefile.in 2009-12-05 12:46:52 UTC (rev 61)
+++ trunk/wxdevcenter/plugins/bitmap/Makefile.in 2009-12-15 17:50:46 UTC (rev 62)
@@ -125,29 +125,10 @@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
Modified: trunk/wxdevcenter/plugins/text/Makefile.am
===================================================================
--- trunk/wxdevcenter/plugins/text/Makefile.am 2009-12-05 12:46:52 UTC (rev 61)
+++ trunk/wxdevcenter/plugins/text/Makefile.am 2009-12-15 17:50:46 UTC (rev 62)
@@ -8,14 +8,14 @@
plugin_LTLIBRARIES = libdctext.la
libdctext_la_SOURCES = \
+ editctrl.hpp \
+ editctrl.cpp \
text.hpp \
text.cpp \
view.hpp \
view.cpp \
prefs.hpp \
prefs.cpp \
- editctrl.hpp \
- editctrl.cpp \
bookmark.hpp \
bookmark.cpp \
text-search.hpp \
@@ -27,7 +27,7 @@
-I$(top_srcdir)/src
libdctext_la_INCLUDES = -I$(top_srcdir)/src
-libdctext_la_LDFLAGS = -L$(top_srcdir)/src
-libdctext_la_LIBADD = $(WX_LIBS)
+libdctext_la_LDFLAGS = -L$(top_srcdir)/src -L$(top_srcdir)/src/widgets
+libdctext_la_LIBADD = $(WX_LIBS) -lwxdcwidgets
#-l$(top_srcdir)/src/wxdevcenter
Modified: trunk/wxdevcenter/plugins/text/Makefile.in
===================================================================
--- trunk/wxdevcenter/plugins/text/Makefile.in 2009-12-05 12:46:52 UTC (rev 61)
+++ trunk/wxdevcenter/plugins/text/Makefile.in 2009-12-15 17:50:46 UTC (rev 62)
@@ -52,9 +52,10 @@
LTLIBRARIES = $(plugin_LTLIBRARIES)
am__DEPENDENCIES_1 =
libdctext_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am_libdctext_la_OBJECTS = libdctext_la-text.lo libdctext_la-view.lo \
- libdctext_la-prefs.lo libdctext_la-editctrl.lo \
- libdctext_la-bookmark.lo libdctext_la-text-search.lo
+am_libdctext_la_OBJECTS = libdctext_la-editctrl.lo \
+ libdctext_la-text.lo libdctext_la-view.lo \
+ libdctext_la-prefs.lo libdctext_la-bookmark.lo \
+ libdctext_la-text-search.lo
libdctext_la_OBJECTS = $(am_libdctext_la_OBJECTS)
libdctext_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(libdctext_la_CXXFLAGS) \
@@ -127,29 +128,10 @@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_...
[truncated message content] |
